querysub 0.661.0 → 0.662.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.661.0",
+  "version": "0.662.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/setupMachineMain.ts

@@ -403,10 +403,10 @@ async function main() {
 
     console.log("Setting up machine:", sshRemote);
 
-    // 0. Update apt
+    // 0. Update apt. nothrow, as apt update exits non-zero when ANY configured repo fails (ex, a stale third-party repo whose vendor rotated its GPG key), and setup only needs the main repos - if those are actually broken, the installs below fail loudly anyway.
     console.log("Updating apt...");
-    await runPromise(`ssh ${sshRemote} "sudo apt update"`);
-    console.log("✅ Apt updated");
+    await runPromise(`ssh ${sshRemote} "sudo apt update"`, { nothrow: true });
+    console.log("✅ Apt updated (any repo errors above are only fatal if the installs below fail)");
 
     // 1. Copy backblaze file to remote server (~/backblaze.json)
     console.log("Copying backblaze credentials...");
@@ -424,7 +424,7 @@ async function main() {
         console.log("✅ Git already installed");
     } catch {
         console.log("Installing git...");
-        await runPromise(`ssh ${sshRemote} "sudo apt update && sudo apt install -y git"`);
+        await runPromise(`ssh ${sshRemote} "sudo apt update; sudo apt install -y git"`);
         console.log("✅ Git installed");
     }
 
@@ -509,7 +509,8 @@ async function main() {
             }
 
             // Get the public key from remote machine
-            const sshPublicKey = await sshValue(sshRemote, "cat ~/.ssh/id_rsa.pub");
+            // Falls back to deriving from the private key, as the .pub file can be missing while the key itself is fine
+            const sshPublicKey = await sshValue(sshRemote, "cat ~/.ssh/id_rsa.pub 2>/dev/null || ssh-keygen -y -f ~/.ssh/id_rsa");
             const keyTitle = `Machine Setup - ${sshRemote} - ${new Date().toISOString()}`;
 
             // Add the deploy key to GitHub repository