cloudron 5.11.11 → 5.12.0

package/bin/cloudron

@@ -170,7 +170,7 @@ program.command('install')
     .option('-a, --alias-domains [domain,...]', 'Alias domains')
     .option('--appstore-id <appid[@version]>', 'Use app from the store')
     .option('--no-sso', 'Disable Cloudron SSO [false]')
-    .option('--debug [cmd]', 'Enable debug mode')
+    .option('--debug [cmd...]', 'Enable debug mode', false)
     .option('--readonly', 'Mount filesystem readonly. Default is read/write in debug mode.')
     .action(actions.install);
 

package/package.json

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

package/src/actions.js

@@ -243,13 +243,7 @@ async function waitForTask(taskId, options) {
         const response = await createRequest('GET', `/api/v1/tasks/${taskId}`, options);
         if (response.statusCode !== 200) throw new Error(`Failed to get task: ${requestError(response)}`);
 
-        // TODO remove later, for now keep old behavior on if `pending` is missing
-        if (typeof response.body.pending === 'undefined') {
-            // note: for queued tasks, 'active' returns false
-            if (response.body.error || response.body.percent === 100) return response.body; // task errored or done
-        } else {
-            if (!response.body.pending && !response.body.active) return response.body;
-        }
+        if (!response.body.active) return response.body;
 
         let message = response.body.message || '';
 
@@ -510,16 +504,6 @@ function queryPortBindings(app, manifest) {
     return portBindings;
 }
 
-// this function can fail on many levels
-function parseDebugCommand(cmd) {
-    // hack for commander
-    if (typeof cmd !== 'string' || cmd === '') return [ '/bin/bash', '-c', 'echo "Debug mode. Use cloudron exec to debug. Sleeping" && sleep 100000' ];
-
-    if (cmd == 'default') return null; // another hack
-
-    return cmd.split(' '); // yet another hack
-}
-
 async function downloadManifest(appstoreId) {
     const [ id, version ] = appstoreId.split('@');
 
@@ -646,10 +630,11 @@ async function install(localOptions, cmd) {
         // the sso only applies for apps which allow optional sso
         if (manifest.optionalSso) data.sso = options.sso;
 
-        if (options.debug) {
+        if (options.debug) { // 'true' when no args.  otherwise, array
+            const debugCmd = options.debug === true ? [ '/bin/bash', '-c', 'echo "Repair mode. Use the webterminal or cloudron exec to repair. Sleeping" && sleep infinity' ] : options.debug;
             data.debugMode = {
                 readonlyRootfs: options.readonly ? true : false,
-                cmd: parseDebugCommand(options.debug)
+                cmd: debugCmd
             };
             data.memoryLimit = -1;
             options.wait = false; // in debug mode, health check never succeeds
@@ -835,10 +820,12 @@ async function debug(args, localOptions, cmd) {
         const app = await getApp(options);
         if (!app) return exit(NO_APP_FOUND_ERROR_STRING);
 
+        const debugCmd = args.length === 0 ? [ '/bin/bash', '-c', 'echo "Repair mode. Use the webterminal or cloudron exec to repair. Sleeping" && sleep infinity' ] : args;
+
         const data = {
             debugMode: options.disable ? null : {
                 readonlyRootfs: options.readonly ? true : false,
-                cmd: parseDebugCommand(args.join(' ').trim())
+                cmd: debugCmd
             }
         };