@getmonoceros/workbench 1.11.9 → 1.11.11

package/dist/bin.js

@@ -667,9 +667,7 @@ var realGitCredentialFill = (input) => {
       stdio: ["pipe", "pipe", "inherit"],
       env: {
         ...process.env,
-        GIT_TERMINAL_PROMPT: "0",
-        GIT_ASKPASS: "",
-        SSH_ASKPASS: ""
+        GIT_TERMINAL_PROMPT: "0"
       }
     });
     let stdout = "";
@@ -682,6 +680,21 @@ var realGitCredentialFill = (input) => {
     child.stdin.end();
   });
 };
+var realGitCredentialApprove = (input) => {
+  return new Promise((resolve, reject) => {
+    const child = spawn("git", ["credential", "approve"], {
+      stdio: ["pipe", "ignore", "inherit"],
+      env: {
+        ...process.env,
+        GIT_TERMINAL_PROMPT: "0"
+      }
+    });
+    child.on("error", reject);
+    child.on("exit", () => resolve());
+    child.stdin.write(input);
+    child.stdin.end();
+  });
+};
 function resolveProvider(host, explicit) {
   const canonical = KNOWN_PROVIDER_HOSTS[host.toLowerCase()];
   if (canonical) return canonical;
@@ -702,14 +715,22 @@ function uniqueHttpsHosts(repos) {
   }
   return [...byHost.values()];
 }
+var BREW_INSTALL_COMMAND = '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"';
 function installCommandForOS(opts) {
+  const withBrewBootstrap = (cmd) => [
+    "",
+    cyan(BREW_INSTALL_COMMAND),
+    cyan(cmd),
+    "",
+    dim("(Skip the first line if you already have Homebrew.)")
+  ].join("\n");
   switch (process.platform) {
     case "darwin":
-      return cyan(opts.brew);
+      return withBrewBootstrap(opts.brew);
     case "win32":
-      return cyan(opts.winget);
+      return ["", cyan(opts.winget)].join("\n");
     default:
-      if (opts.linuxBrew) return cyan(opts.linuxBrew);
+      if (opts.linuxBrew) return withBrewBootstrap(opts.linuxBrew);
       return `See ${opts.linuxDocsUrl} for package instructions.`;
   }
 }
@@ -834,6 +855,7 @@ async function collectGitCredentials(devContainerRoot, hosts, options = {}) {
   const credsDir = path2.join(devContainerRoot, ".monoceros");
   const credentialsPath = path2.join(credsDir, "git-credentials");
   const spawnFn = options.spawn ?? realGitCredentialFill;
+  const approveFn = options.approve ?? realGitCredentialApprove;
   const logger = options.logger ?? { info: () => {
   }, warn: () => {
   } };
@@ -884,6 +906,16 @@ host=${host}
     }
     lines.push(formatCredentialLine(host, username, password));
     perHost.push({ host, provider, status: "ok", detail: "" });
+    const approveInput = `protocol=https
+host=${host}
+username=${username}
+password=${password}
+
+`;
+    try {
+      await approveFn(approveInput);
+    } catch {
+    }
   }
   await fs2.mkdir(credsDir, { recursive: true });
   await fs2.writeFile(
@@ -4154,9 +4186,7 @@ var realGitLsRemote = (url) => {
       stdio: ["ignore", "pipe", "pipe"],
       env: {
         ...process.env,
-        GIT_TERMINAL_PROMPT: "0",
-        GIT_ASKPASS: "",
-        SSH_ASKPASS: ""
+        GIT_TERMINAL_PROMPT: "0"
       }
     });
     let stdout = "";
@@ -4785,7 +4815,7 @@ async function persistPromptedIdentity(prompted, ymlPath, home, logger) {
 }
 
 // src/version.ts
-var CLI_VERSION = true ? "1.11.9" : "dev";
+var CLI_VERSION = true ? "1.11.11" : "dev";
 
 // src/commands/_dispatch.ts
 import { consola as consola12 } from "consola";