Switch homebrew to use askpass

Author: kevinwang5658

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "default",
-  "version": "1.1.0-beta1",
+  "version": "1.1.0-beta4",
   "description": "Default plugin for Codify - provides 50+ declarative resources for managing development tools and system configuration across macOS and Linux",
   "main": "dist/index.js",
   "scripts": {
@@ -42,8 +42,8 @@
   "license": "ISC",
   "type": "module",
   "dependencies": {
-    "@codifycli/plugin-core": "1.1.0-beta12",
-    "@codifycli/schemas": "1.1.0-beta4",
+    "@codifycli/plugin-core": "1.1.0-beta16",
+    "@codifycli/schemas": "1.1.0-beta5",
     "ajv": "^8.18.0",
     "ajv-formats": "^2.1.1",
     "chalk": "^5.3.0",

package.json

@@ -100,48 +100,16 @@ export class HomebrewResource extends Resource<HomebrewConfig> {
       return this.installBrewInCustomDir(plan.desiredConfig.directory)
     }
 
-    const askpassPath = path.join(os.tmpdir(), `codify-askpass-${nanoid(8)}.sh`);
-
-    const askpassScript = `#!/bin/bash
-prompt="\${1:-Password: }"
-printf '\\033[34m%s\\033[0m' "$prompt" > /dev/tty
-
-password=""
-while IFS= read -r -s -n1 -d '' char < /dev/tty; do
-  if [[ "$char" == $'\\0' || "$char" == $'\\n' || "$char" == $'\\r' ]]; then
-    break
-  elif [[ "$char" == $'\\177' || "$char" == $'\\b' ]]; then
-    if [[ -n "$password" ]]; then
-      password="\${password%?}"
-      printf '\\b \\b' > /dev/tty
-    fi
-  else
-    password+="$char"
-    printf '*' > /dev/tty
-  fi
-done
-
-printf '\\n' > /dev/tty
-printf '%s\\n' "$password"
-`;
 
-    try {
-      await fs.writeFile(askpassPath, askpassScript, { mode: 0o700 });
-
-      await $.spawn(
-        '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"',
-        {
-          stdin: true,
-          interactive: true,
-          env: {
-            NONINTERACTIVE: 1,
-            SUDO_ASKPASS: askpassPath,
-          },
-        }
-      );
-    } finally {
-      await fs.unlink(askpassPath).catch(() => {});
-    }
+    await $.spawn(
+      '/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"',
+      {
+        requiresSudoAskpass: true,
+        env: {
+          NONINTERACTIVE: 1,
+        },
+      }
+    );
 
     const brewPath = Utils.isLinux() ? '/home/linuxbrew/.linuxbrew/bin/brew' : '/opt/homebrew/bin/brew';
     await FileUtils.addToShellRc(`eval "$(${brewPath} shellenv)"`);
@@ -153,7 +121,7 @@ printf '%s\\n' "$password"
   override async destroy(): Promise<void> {
     const $ = getPty();
 
-    const { status } = await $.spawnSafe('which brew');
+    const { status } = await $.spawnSafe('which brew', { interactive: true });
     if (status === SpawnStatus.ERROR) {
       return;
     }
@@ -164,8 +132,12 @@ printf '%s\\n' "$password"
     if (homebrewDirectory === '/opt/homebrew') {
       await $.spawnSafe(
         '/bin/bash -c "$(/usr/bin/curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/uninstall.sh)"',
-        { stdin: true, interactive: true, env: { INTERACTIVE: 1 } }
-      )
+        {
+          requiresSudoAskpass: true,
+          env: {
+            NONINTERACTIVE: 1,
+          },
+        })
     } else {
       await $.spawn(`rm -rf ${homebrewDirectory}`, { requiresRoot: true });
     }