cloudron 5.11.5 → 5.11.7

package/bin/cloudron

@@ -32,7 +32,6 @@ program.option('--server <server>', 'Cloudron domain')
 
 // these are separate binaries since global options are not applicable
 program.command('appstore', 'Cloudron appstore commands');
-program.command('repo', 'Cloudron repo commands');
 program.command('build', 'Cloudron build commands');
 
 const backupCommand = program.command('backup')

package/bin/cloudron-appstore

@@ -2,10 +2,17 @@
 
 'use strict';
 
-const { program } = require('commander'),
-    appstoreActions = require('../src/appstore-actions.js');
+const appstoreActions = require('../src/appstore-actions.js'),
+    Command = require('commander').Command;
 
-program.version(require('../package.json').version);
+const version = require('../package.json').version;
+
+const program = new Command();
+program.version(version);
+
+// global options. IMPORTANT: These cannot conflict with global options!
+program
+    .option('--appstore-token <token>', 'AppStore token');
 
 program.command('login')
     .description('Login to the appstore')
@@ -22,16 +29,15 @@ program.command('info')
     .option('--appstore-id <appid@version>', 'Appstore id and version')
     .action(appstoreActions.info);
 
-program.command('published')
-    .description('List published apps from this account')
-    .option('-i --image', 'Display docker image')
-    .action(appstoreActions.listPublishedApps);
-
 program.command('approve')
     .description('Approve a submitted app version')
     .option('--appstore-id <appid@version>', 'Appstore id and version')
     .action(appstoreActions.approve);
 
+program.command('tag <version>')
+    .description('Tag the repo')
+    .action(appstoreActions.tag);
+
 program.command('revoke')
     .description('Revoke a published app version')
     .option('--appstore-id <appid@version>', 'Appstore id and version')
@@ -41,12 +47,6 @@ program.command('submit')
     .description('Submit app to the store for review')
     .action(appstoreActions.submit);
 
-program.command('unpublish')
-    .description('Delete app or app version from the store')
-    .option('--appstore-id <id@[version]>', 'Unpublish app')
-    .option('-f, --force', 'Do not ask anything')
-    .action(appstoreActions.unpublish);
-
 program.command('upload')
     .description('Upload app to the store for testing')
     .option('-i, --image <image>', 'Docker image')
@@ -54,6 +54,7 @@ program.command('upload')
     .action(appstoreActions.upload);
 
 program.command('versions')
+    .alias('list')
     .description('List published versions')
     .option('--appstore-id <id>', 'Appstore id')
     .option('--raw', 'Dump versions as json')

package/bin/cloudron-build

@@ -12,9 +12,9 @@ function collectArgs(value, collected) {
     return collected;
 }
 
-// global options
+// global options. IMPORTANT: These cannot conflict with global options!
 program.option('--server <server>', 'Cloudron domain')
-    .option('--token, --build-service-token <token>', 'Build service token')
+    .option('--build-token, --build-service-token <token>', 'Build service token')
     .option('--url, --set-build-service [buildservice url]', 'Set build service URL. This build service is automatically used for future calls from this project');
 
 program.command('build', { isDefault: true })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cloudron",
-  "version": "5.11.5",
+  "version": "5.11.7",
   "license": "MIT",
   "description": "Cloudron Commandline Tool",
   "main": "main.js",

package/src/appstore-actions.js

@@ -4,12 +4,14 @@
 
 const assert = require('assert'),
     config = require('./config.js'),
+    execSync = require('child_process').execSync,
     fs = require('fs'),
     { exit, locateManifest } = require('./helper.js'),
     manifestFormat = require('cloudron-manifestformat'),
     path = require('path'),
     readlineSync = require('readline-sync'),
     safe = require('safetydance'),
+    semver = require('semver'),
     superagent = require('superagent'),
     Table = require('easy-table');
 
@@ -22,8 +24,8 @@ exports = module.exports = {
     upload,
     revoke,
     approve,
-    unpublish,
-    listPublishedApps
+
+    tag
 };
 
 const NO_MANIFEST_FOUND_ERROR_STRING = 'No CloudronManifest.json found';
@@ -34,10 +36,12 @@ function requestError(response) {
     return `${response.statusCode} message: ${response.body.message || JSON.stringify(response.body)}`; // body is sometimes just a string like in 401
 }
 
-function createRequest(method, apiPath) {
+function createRequest(method, apiPath, options) {
+    const token = options.appstoreToken || config.appStoreToken();
+
     let url = `${config.appStoreOrigin()}${apiPath}`;
     if (url.includes('?')) url += '&'; else url += '?';
-    url += `accessToken=${config.appStoreToken()}`;
+    url += `accessToken=${token}`;
     const request = superagent(method, url);
     request.retry(3);
     request.ok(() => true);
@@ -61,7 +65,7 @@ async function getAppstoreId(appstoreId) {
     return [manifest.id, manifest.version];
 }
 
-async function authenticate(options) {
+async function authenticate(options) { // maybe we can use options.token to valid using a profile call?
     if (!options.hideBanner) {
         const webDomain = config.appStoreOrigin().replace('https://api.', '');
         console.log(`${webDomain} login` + ` (If you do not have one, sign up at https://${webDomain}/console.html#/register)`);
@@ -99,7 +103,8 @@ async function authenticate(options) {
     console.log('Login successful.');
 }
 
-async function login(options) {
+async function login(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
     await authenticate(options);
 }
 
@@ -108,11 +113,12 @@ function logout() {
     console.log('Done.');
 }
 
-async function info(options) {
+async function info(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
     const [id, version] = await getAppstoreId(options.appstoreId);
 
-    const response = await createRequest('GET', `/api/v1/developers/apps/${id}/versions/${version}`);
-    if (response.statusCode !== 200) throw new Error(`Failed to list domains: ${requestError(response)}`);
+    const response = await createRequest('GET', `/api/v1/developers/apps/${id}/versions/${version}`, options);
+    if (response.statusCode !== 200) return exit(new Error(`Failed to list versions: ${requestError(response)}`));
 
     const manifest = response.body.manifest;
     console.log('id: %s', manifest.id);
@@ -123,11 +129,12 @@ async function info(options) {
     console.log('contactEmail: %s', manifest.contactEmail);
 }
 
-async function listVersions(options) {
+async function listVersions(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
     const [id] = await getAppstoreId(options.appstoreId);
 
-    const response = await createRequest('GET', `/api/v1/developers/apps/${id}/versions`);
-    if (response.statusCode !== 200) throw new Error(`Failed to list domains: ${requestError(response)}`);
+    const response = await createRequest('GET', `/api/v1/developers/apps/${id}/versions`, options);
+    if (response.statusCode !== 200) return exit(new Error(`Failed to list versions: ${requestError(response)}`));
 
     if (response.body.versions.length === 0) return console.log('No versions found.');
 
@@ -148,17 +155,6 @@ async function listVersions(options) {
     console.log(t.toString());
 }
 
-async function addApp(manifest, baseDir) {
-    assert.strictEqual(typeof manifest, 'object');
-    assert.strictEqual(typeof baseDir, 'string');
-
-    const request = createRequest('POST', '/api/v1/developers/apps');
-    request.send({ id: manifest.id });
-    const response = await request;
-    if (response.statusCode === 409) return; // already exists
-    if (response.statusCode !== 201) return exit(`Failed to add app: ${requestError(response)}`);
-}
-
 function parseChangelog(file, version) {
     let changelog = '';
     const data = safe.fs.readFileSync(file, 'utf8');
@@ -182,9 +178,10 @@ function parseChangelog(file, version) {
     return changelog;
 }
 
-async function addVersion(manifest, baseDir) {
+async function addVersion(manifest, baseDir, options) {
     assert.strictEqual(typeof manifest, 'object');
     assert.strictEqual(typeof baseDir, 'string');
+    assert.strictEqual(typeof options, 'object');
 
     let iconFilePath = null;
     if (manifest.icon) {
@@ -218,7 +215,7 @@ async function addVersion(manifest, baseDir) {
         if (!manifest.changelog) throw new Error('Bad changelog format or missing changelog for this version');
     }
 
-    const request = createRequest('POST', `/api/v1/developers/apps/${manifest.id}/versions`);
+    const request = createRequest('POST', `/api/v1/developers/apps/${manifest.id}/versions`, options);
     if (iconFilePath) request.attach('icon', iconFilePath);
     request.attach('manifest', Buffer.from(JSON.stringify(manifest)), 'manifest');
     const response = await request;
@@ -226,9 +223,10 @@ async function addVersion(manifest, baseDir) {
     if (response.statusCode !== 204) throw new Error(`Failed to publish version: ${requestError(response)}`);
 }
 
-async function updateVersion(manifest, baseDir) {
+async function updateVersion(manifest, baseDir, options) {
     assert.strictEqual(typeof manifest, 'object');
     assert.strictEqual(typeof baseDir, 'string');
+    assert.strictEqual(typeof options, 'object');
 
     let iconFilePath = null;
     if (manifest.icon) {
@@ -260,91 +258,15 @@ async function updateVersion(manifest, baseDir) {
         if (!manifest.changelog) throw new Error('Could not read changelog or missing version changes');
     }
 
-    const request = createRequest('PUT', `/api/v1/developers/apps/${manifest.id}/versions/${manifest.version}`);
+    const request = createRequest('PUT', `/api/v1/developers/apps/${manifest.id}/versions/${manifest.version}`, options);
     if (iconFilePath) request.attach('icon', iconFilePath);
     request.attach('manifest', Buffer.from(JSON.stringify(manifest)), 'manifest');
     const response = await request;
     if (response.statusCode !== 204) throw new Error(`Failed to publish version: ${requestError(response)}`);
 }
 
-async function delVersion(manifest, force) {
-    assert.strictEqual(typeof manifest, 'object');
-    assert.strictEqual(typeof force, 'boolean');
-
-    if (!force) {
-        console.log(`This will delete the version ${manifest.version} of app ${manifest.id} from the appstore!`);
-        const reallyDelete = readlineSync.question('Really do this? [y/N]: ', {});
-        if (reallyDelete.toUpperCase() !== 'Y') exit();
-    }
-
-    const response = await createRequest('DEL', `/api/v1/developers/apps/${manifest.id}/versions/${manifest.version}`);
-    if (response.statusCode !== 204) return exit(`Failed to unpublish version: ${requestError(response)}`);
-
-    console.log('version unpublished.');
-}
-
-async function revokeVersion(appstoreId, version) {
-    assert.strictEqual(typeof appstoreId, 'string');
-    assert.strictEqual(typeof version, 'string');
-
-    const response = await createRequest('POST', `/api/v1/developers/apps/${appstoreId}/versions/${version}/revoke`);
-    if (response.statusCode !== 200) return exit(`Failed to revoke version: ${requestError(response)}`);
-
-    console.log('version revoked.');
-}
-
-async function approveVersion(appstoreId, version) {
-    assert.strictEqual(typeof appstoreId, 'string');
-    assert.strictEqual(typeof version, 'string');
-
-    const response = await createRequest('POST', `/api/v1/developers/apps/${appstoreId}/versions/${version}/approve`);
-    if (response.statusCode !== 200) return exit(`Failed to approve version: ${requestError(response)}`);
-
-    console.log('Approved.');
-    console.log('');
-
-    const response2 = await createRequest('GET', `/api/v1/developers/apps/${appstoreId}/versions/${version}`);
-    if (response2.statusCode !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
-
-    console.log('Changelog for forum update: ' + response2.body.manifest.forumUrl);
-    console.log('');
-    console.log('[' + version + ']');
-    console.log(response2.body.manifest.changelog);
-    console.log('');
-}
-
-async function delApp(appId, force) {
-    assert.strictEqual(typeof appId, 'string');
-    assert.strictEqual(typeof force, 'boolean');
-
-    if (!force) {
-        console.log('This will delete app %s from the appstore!', appId);
-        const reallyDelete = readlineSync.question('Really do this? [y/N]: ', {});
-        if (reallyDelete.toUpperCase() !== 'Y') return exit();
-    }
-
-    const response = await createRequest('DEL', `/api/v1/developers/apps/${appId}`);
-    if (response.statusCode !== 204) exit(`Failed to unpublish app : ${requestError(response)}`);
-
-    console.log('App unpublished.');
-}
-
-async function submitAppForReview(manifest) {
-    assert.strictEqual(typeof manifest, 'object');
-
-    const response = await createRequest('POST', `/api/v1/developers/apps/${manifest.id}/versions/${manifest.version}/submit`);
-    if (response.statusCode === 404) {
-        console.log(`No version ${manifest.version} found. Please use 'cloudron apsptore upload' first`);
-        return exit('Failed to submit app for review.');
-    }
-
-    if (response.statusCode !== 200) return exit(`Failed to submit app: ${requestError(response)}`);
-
-    console.log('App submitted for review.');
-    console.log('You will receive an email when approved.');
-}
-
-async function upload(options) {
+async function upload(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
     // try to find the manifest of this project
     const manifestFilePath = locateManifest();
     if (!manifestFilePath) return exit(NO_MANIFEST_FOUND_ERROR_STRING);
@@ -371,75 +293,137 @@ async function upload(options) {
 
     // ensure the app is known on the appstore side
     const baseDir = path.dirname(manifestFilePath);
-    await addApp(manifest, baseDir);
+
+    const request = createRequest('POST', '/api/v1/developers/apps', options);
+    request.send({ id: manifest.id });
+    const response = await request;
+    if (response.statusCode !== 409 && response.statusCode !== 201) return exit(`Failed to add app: ${requestError(response)}`); // 409 means already exists
     console.log(`Uploading ${manifest.id}@${manifest.version} (dockerImage: ${manifest.dockerImage}) for testing`);
 
-    const [error2] = await safe(options.force ? updateVersion(manifest, baseDir) : addVersion(manifest, baseDir));
+    const [error2] = await safe(options.force ? updateVersion(manifest, baseDir, options) : addVersion(manifest, baseDir, options));
     if (error2) return exit(error2);
 }
 
-function submit() {
+async function submit(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
+
     // try to find the manifest of this project
-    var manifestFilePath = locateManifest();
+    const manifestFilePath = locateManifest();
     if (!manifestFilePath) return exit(NO_MANIFEST_FOUND_ERROR_STRING);
 
-    var result = manifestFormat.parseFile(manifestFilePath);
+    const result = manifestFormat.parseFile(manifestFilePath);
     if (result.error) return exit(result.error.message);
 
-    var manifest = result.manifest;
-
-    submitAppForReview(manifest, exit);
-}
-
-async function unpublish(options) {
-    const [id, version] = await getAppstoreId(options.appstoreId);
+    const manifest = result.manifest;
 
-    if (!version) {
-        console.log(`Unpublishing ${options.appstoreId}`);
-        await delApp(options.app, !!options.force);
-        return;
+    const response = await createRequest('POST', `/api/v1/developers/apps/${manifest.id}/versions/${manifest.version}/submit`, options);
+    if (response.statusCode === 404) {
+        console.log(`No version ${manifest.version} found. Please use 'cloudron apsptore upload' first`);
+        return exit('Failed to submit app for review.');
     }
 
-    console.log(`Unpublishing ${id}@${version}`);
-    await delVersion(id, !!options.force);
+    if (response.statusCode !== 200) return exit(`Failed to submit app: ${requestError(response)}`);
+
+    console.log('App submitted for review.');
+    console.log('You will receive an email when approved.');
 }
 
-async function revoke(options) {
+async function revoke(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
     const [id, version] = await getAppstoreId(options.appstoreId);
     if (!version) return exit('--appstore-id must be of the format id@version');
 
     console.log(`Revoking ${id}@${version}`);
-    await revokeVersion(id, version);
+
+    const response = await createRequest('POST', `/api/v1/developers/apps/${id}/versions/${version}/revoke`, options);
+    if (response.statusCode !== 200) return exit(`Failed to revoke version: ${requestError(response)}`);
+
+    console.log('version revoked.');
 }
 
-async function approve(options) {
-    const [id, version] = await getAppstoreId(options.appstoreId);
+async function approve(localOptions, cmd) {
+    const options = cmd.optsWithGlobals();
+
+    const [appstoreId, version] = await getAppstoreId(options.appstoreId);
 
     if (!version) return exit('--appstore-id must be of the format id@version');
 
-    console.log(`Approving ${id}@${version}`);
+    console.log(`Approving ${appstoreId}@${version}`);
+
+    const response = await createRequest('POST', `/api/v1/developers/apps/${appstoreId}/versions/${version}/approve`, options);
+    if (response.statusCode !== 200) return exit(`Failed to approve version: ${requestError(response)}`);
+
+    console.log('Approved.');
+    console.log('');
 
-    await approveVersion(id, version);
+    const response2 = await createRequest('GET', `/api/v1/developers/apps/${appstoreId}/versions/${version}`, options);
+    if (response2.statusCode !== 200) return exit(`Failed to list apps: ${requestError(response)}`);
+
+    console.log('Changelog for forum update: ' + response2.body.manifest.forumUrl);
+    console.log('');
+    console.log('[' + version + ']');
+    console.log(response2.body.manifest.changelog);
+    console.log('');
 }
 
-// TODO currently no pagination, only needed once we have users with more than 100 apps
-async function listPublishedApps(options) {
-    const response = await createRequest('GET', '/api/v1/developers/apps?per_page=100');
-    if (response.statusCode !== 200) return exit(`Failed to get list of published apps: ${requestError(response)}`);
-    if (response.body.apps.length === 0) return console.log('No apps published.');
+async function tag(version) {
+    const basename = `${path.basename(process.cwd())}`;
+    if (!basename.endsWith('-app')) return exit('Does not look like a app repo. Has to end with -app');
 
-    const t = new Table();
+    if (!semver.valid(version)) return exit(`${version} is not a valid semver`);
 
-    response.body.apps.forEach(function (app) {
-        t.cell('Id', app.id);
-        t.cell('Title', app.manifest.title);
-        t.cell('Latest Version', app.manifest.version);
-        t.cell('Publish State', app.publishState);
-        t.cell('Creation Date', new Date(app.creationDate));
-        if (options.image) t.cell('Image', app.manifest.dockerImage);
-        t.newRow();
-    });
+    const latestTag = safe.child_process.execSync('git describe --tags --abbrev=0', { encoding: 'utf8' });
+    if (safe.error) return exit(`Failed to get last release tag: ${safe.error.message}`);
 
-    console.log();
-    console.log(t.toString());
+    const manifestFilePath = locateManifest();
+    if (!manifestFilePath) return exit('Could not locate CloudronManifest.json');
+
+    const result = manifestFormat.parseFile(manifestFilePath);
+    if (result.error) return exit(new Error(`Invalid CloudronManifest.json: ${result.error.message}`));
+    const { manifest } = result;
+
+    const latestVersion = latestTag.match(/v(.*)/)[1];
+
+    if (semver.lte(version, latestVersion)) return exit(`${version} is less than or equal to last repo tag ${latestVersion}`);
+    if (semver.inc(latestVersion, 'major') !== version
+        && semver.inc(latestVersion, 'minor') !== version
+        && semver.inc(latestVersion, 'patch') !== version) {
+            return exit(`${version} is not the next major/minor/patch of last published version ${latestVersion}`);
+    }
+
+    const latestRenovateCommit = safe.child_process.execSync('git log -n 1 --committer=renovatebot@cloudron.io --pretty="format:%h,%aI,%s"', { encoding: 'utf8' });
+    if (!latestRenovateCommit) return exit('Could not find a commit from renovate bot');
+
+    const [ , , commitMessage ] = latestRenovateCommit.split(',');
+    const repoDir = path.dirname(manifestFilePath);
+    const upstreamVersion = commitMessage.match(/update dependency .* to (.*)/)[1];
+
+    console.log(`Enter the changelog for ${upstreamVersion}: (press ctrl+D to finish)`);
+    const rawChangelog = fs.readFileSync(0, 'utf-8');
+    const mdChangelog = rawChangelog.split('\n').map(line => {
+        line = line.trim();
+        line = line.replace(/[\u{0080}-\u{FFFF}]/gu, ''); // only ascii
+        line = line.replace(/^\* /, ''); // replace any "* " in the front
+        return line ? `* ${line}` : '';
+    }).join('\n');
+    const newChangelog = `\n[${version}]\n* Update ${manifest.title} to ${upstreamVersion}\n${mdChangelog}\n`;
+    const changelogFile = `${repoDir}/${manifest.changelog.replace('file://', '')}`; // sometimes CHANGELOG, sometimes CHANGELOG.md
+    fs.appendFileSync(changelogFile, newChangelog);
+
+    manifest.version = version;
+    manifest.upstreamVersion = upstreamVersion;
+    fs.writeFileSync('CloudronManifest.json', JSON.stringify(manifest, null, 2));
+
+    // git branch --show-current does not work in CI :/
+    const mainOrMaster = safe.child_process.execSync('git branch -r --list origin/master origin/main', { encoding: 'utf8' });
+    if (safe.error) return exit('Could not determine branch name');
+    const branch = mainOrMaster.includes('master') ? 'master' : 'main';
+
+    execSync(`git commit -a -m 'Version ${version}'`, { encoding: 'utf8' });
+    execSync(`git tag v${version} -a -m 'Version ${version}'`, { encoding: 'utf8' });
+    console.log(`git push --atomic origin ${branch} v${version}`);
+    execSync(`git push --atomic origin HEAD:${branch} v${version}`, { encoding: 'utf8' }); // push this tag only. in CI, we might have a git cache
+    if (safe.error) return exit(`Failed to push tag v${version} and branch ${branch}: ${safe.error.message}`, { encoding: 'utf8' });
+
+    console.log(`Created tag v${version} and pushed branch ${branch}`);
 }

package/bin/cloudron-repo

@@ -1,18 +0,0 @@
-#!/usr/bin/env node
-
-'use strict';
-
-const { program } = require('commander'),
-    repoActions = require('../src/repo-actions.js');
-
-program.version(require('../package.json').version);
-
-program.command('tag <version>')
-    .description('Creates a new release with given tag')
-    .action(repoActions.tag);
-
-program.command('publish')
-    .description('Publish to appstore')
-    .action(repoActions.publish);
-
-program.parse(process.argv);

package/src/repo-actions.js

@@ -1,102 +0,0 @@
-/* jshint node:true */
-
-'use strict';
-
-const { exit, locateManifest } = require('./helper.js'),
-    execSync = require('child_process').execSync,
-    fs = require('fs'),
-    manifestFormat = require('cloudron-manifestformat'),
-    path = require('path'),
-    safe = require('safetydance'),
-    semver = require('semver');
-
-exports = module.exports = {
-    tag,
-    publish
-};
-
-async function tag(version, options) {
-    const basename = `${path.basename(process.cwd())}`;
-    if (!basename.endsWith('-app')) return exit('Does not look like a app repo. Has to end with -app');
-
-    if (!semver.valid(version)) return exit(`${version} is not a valid semver`);
-
-    const latestTag = safe.child_process.execSync('git describe --tags --abbrev=0', { encoding: 'utf8' });
-    if (safe.error) return exit(`Failed to get last release tag: ${safe.error.message}`);
-
-    const manifestFilePath = locateManifest();
-    if (!manifestFilePath) return exit('Could not locate CloudronManifest.json');
-
-    const latestVersion = latestTag.match(/v(.*)/)[1];
-
-    if (semver.lte(version, latestVersion)) return exit(`${version} is less than or equal to last repo tag ${latestVersion}`);
-    if (semver.inc(latestVersion, 'major') !== version
-        && semver.inc(latestVersion, 'minor') !== version
-        && semver.inc(latestVersion, 'patch') !== version) {
-            return exit(`${version} is not the next major/minor/patch of last published version ${latestVersion}`);
-    }
-
-    const latestRenovateCommit = safe.child_process.execSync('git log -n 1 --committer=renovatebot@cloudron.io --pretty="format:%h,%aI,%s"', { encoding: 'utf8' });
-    if (!latestRenovateCommit) return exit('Could not find a commit from renovate bot');
-
-    const [ abbrevHash, commitDate, commitMessage ] = latestRenovateCommit.split(',');
-    const cleanDate = commitDate.replace(/T.*/, '').replace(/[-]/g, '');
-    const repoDir = path.dirname(manifestFilePath);
-    const repoName = path.basename(repoDir).replace('-app', '');
-    const dockerImage = options.image || `cloudron/${repoName}:${cleanDate}-${abbrevHash}`;
-    const upstreamVersion = commitMessage.match(/update dependency .* to (.*)/)[1];
-
-    const result = manifestFormat.parseFile(manifestFilePath);
-    if (result.error) throw new Error(`Invalid CloudronManifest.json: ${result.error.message}`);
-    const { manifest } = result;
-
-    console.log(`Enter the changelog for ${upstreamVersion}: (press ctrl+D to finish)`);
-    const rawChangelog = fs.readFileSync(0, 'utf-8');
-    const mdChangelog = rawChangelog.split('\n').map(line => {
-        line = line.trim();
-        line = line.replace(/[\u{0080}-\u{FFFF}]/gu, ''); // only ascii
-        line = line.replace(/^\* /, ''); // replace any "* " in the front
-        return line ? `* ${line}` : '';
-    }).join('\n');
-    const newChangelog = `\n[${version}]\n* Update ${manifest.title} to ${upstreamVersion}\n${mdChangelog}\n`;
-    const changelogFile = `${repoDir}/${manifest.changelog.replace('file://', '')}`; // sometimes CHANGELOG, sometimes CHANGELOG.md
-    fs.appendFileSync(changelogFile, newChangelog);
-
-    manifest.version = version;
-    manifest.upstreamVersion = upstreamVersion;
-    fs.writeFileSync('CloudronManifest.json', JSON.stringify(manifest, null, 2));
-
-    // git branch --show-current does not work in CI :/
-    const mainOrMaster = safe.child_process.execSync('git branch -r --list origin/master origin/main', { encoding: 'utf8' });
-    if (safe.error) return exit('Could not determine branch name');
-    const branch = mainOrMaster.includes('master') ? 'master' : 'main';
-
-    execSync(`git commit -a -m 'Version ${version}'`, { encoding: 'utf8' });
-    execSync(`git tag v${version} -a -m 'Version ${version}'`, { encoding: 'utf8' });
-    console.log(`git push --atomic origin ${branch} v${version}`);
-    execSync(`git push --atomic origin HEAD:${branch} v${version}`, { encoding: 'utf8' }); // push this tag only. in CI, we might have a git cache
-    if (safe.error) return exit(`Failed to push tag v${version} and branch ${branch}: ${safe.error.message}`, { encoding: 'utf8' });
-
-    console.log(`Created tag v${version} and pushed branch ${branch}`);
-}
-
-async function publish(options) {
-    const manifestFilePath = locateManifest();
-    if (!manifestFilePath) return exit('Could not locate CloudronManifest.json');
-
-    const latestRenovateCommit = safe.child_process.execSync('git log -n 1 --committer=renovatebot@cloudron.io --pretty="format:%h,%aI,%s"', { encoding: 'utf8' });
-    if (!latestRenovateCommit) return exit('Could not find a commit from renovate bot');
-
-    const [ abbrevHash, commitDate ] = latestRenovateCommit.split(',');
-    const cleanDate = commitDate.replace(/T.*/, '').replace(/[-]/g, '');
-    const repoDir = path.dirname(manifestFilePath);
-    const repoName = path.basename(repoDir).replace('-app', '');
-    const dockerImage = options.image || `cloudron/${repoName}:${cleanDate}-${abbrevHash}`;
-
-    safe.child_process.execSync(`cloudron appstore upload --image ${dockerImage}`);
-    if (safe.error) return exit(`Failed to publish image to appstore: ${safe.error.message}`);
-    execSync(`cloudron appstore submit`);
-    execSync(`cloudron appstore approve`);
-
-    console.log('Published to appstore');
-}