querysub 0.286.0 → 0.288.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.286.0",
+  "version": "0.288.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/deployManager/machine.sh

@@ -1,6 +1,9 @@
 #! /bin/bash
 tmux new -s machine-alwaysup -d
-# Kill anything that is running on it first
 tmux send-keys -t machine-alwaysup "C-c" Enter
 sleep 3
+# ctrl+c wasn't working, which causes huge issues, so... just kill the screen so it's definitely dead
+tmux kill-session -t machine-alwaysup 2>/dev/null || true
+tmux new -s machine-alwaysup -d
+sleep 3
 tmux send-keys -t machine-alwaysup "cd ~/machine-alwaysup && yarn machine-alwaysup" Enter

package/src/deployManager/machineController.ts

@@ -135,7 +135,7 @@ class MachineControllerBase {
             gitRef: config.gitRef,
         });
         await runPromise("yarn install", { cwd: gitFolder });
-        await runPromise("bash machine-startup.sh", { cwd: os.homedir() });
+        await runPromise("bash machine-startup.sh", { cwd: os.homedir(), detach: true });
     }
 
 }

package/src/functional/runCommand.ts

@@ -8,6 +8,7 @@ export async function runPromise(command: string, config?: {
     quiet?: boolean;
     // Never throw, just return the full output
     nothrow?: boolean;
+    detach?: boolean;
 }) {
     return new Promise<string>((resolve, reject) => {
         console.log(">" + blue(command));
@@ -15,6 +16,7 @@ export async function runPromise(command: string, config?: {
             shell: true,
             cwd: config?.cwd,
             stdio: ["inherit", "pipe", "pipe"],
+            detached: config?.detach,
         });
 
         let fullOutput = "";