test homebrew noninteractive install

Author: ChrisTitusTech

MacUtilGUI/Services/ScriptService.fs

@@ -69,8 +69,8 @@ module ScriptService =
 export TERM=${TERM:-xterm-256color}
 export DEBIAN_FRONTEND=noninteractive
 export CI=true
-export NONINTERACTIVE=1
-export FORCE_NONINTERACTIVE=1
+export NONINTERACTIVE=0
+export FORCE_NONINTERACTIVE=0
 export HOMEBREW_NO_ENV_HINTS=1
 export HOMEBREW_NO_INSTALL_CLEANUP=1
 export HOMEBREW_NO_AUTO_UPDATE=1
@@ -110,11 +110,8 @@ set +m        # Disable job control
 
     // Function to check if a script needs elevation (contains sudo, $ESCALATION_TOOL, etc.)
     let needsElevation (scriptContent: string) : bool =
-        scriptContent.Contains("sudo ")
-        || scriptContent.Contains("$ESCALATION_TOOL")
+        scriptContent.Contains("$ESCALATION_TOOL")
         || scriptContent.Contains("${ESCALATION_TOOL}")
-        || scriptContent.Contains("/usr/bin/sudo")
-        || scriptContent.Contains("/bin/sudo")
 
     let getEmbeddedResource (resourcePath: string) : string option =
         try
@@ -362,8 +359,8 @@ set +m        # Disable job control
                                 "export TERM=xterm-256color\n" +
                                 "export DEBIAN_FRONTEND=noninteractive\n" +
                                 "export CI=true\n" +
-                                "export NONINTERACTIVE=1\n" +
-                                "export FORCE_NONINTERACTIVE=1\n" +
+                                "export NONINTERACTIVE=0\n" +
+                                "export FORCE_NONINTERACTIVE=0\n" +
                                 "export HOMEBREW_NO_ENV_HINTS=1\n" +
                                 "export HOMEBREW_NO_INSTALL_CLEANUP=1\n" +
                                 "export HOMEBREW_NO_AUTO_UPDATE=1\n" +

scripts/common-script.sh

@@ -22,18 +22,54 @@ done
 return 0
 }
 
+setup_askpass() {
+    # Create a temporary askpass helper script
+    ASKPASS_SCRIPT="/tmp/macutil_askpass_$$"
+    cat > "$ASKPASS_SCRIPT" << 'EOF'
+#!/bin/sh
+osascript -e 'display dialog "Administrator password required for MacUtil setup:" default answer "" with hidden answer' -e 'text returned of result' 2>/dev/null
+EOF
+    chmod +x "$ASKPASS_SCRIPT"
+    export SUDO_ASKPASS="$ASKPASS_SCRIPT"
+}
+
+cleanup_askpass() {
+    # Clean up the temporary askpass script
+    if [ -n "$ASKPASS_SCRIPT" ] && [ -f "$ASKPASS_SCRIPT" ]; then
+        rm -f "$ASKPASS_SCRIPT"
+    fi
+}
+
 checkPackageManager() {
     ## Check if brew is installed
     if command_exists "brew"; then
         printf "%b\n" "${GREEN}Homebrew is installed${RC}"
     else
         printf "%b\n" "${RED}Homebrew is not installed${RC}"
         printf "%b\n" "${YELLOW}Installing Homebrew...${RC}"
-        /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-        if [ $? -ne 0 ]; then
+        
+        # Setup askpass helper for automated password handling
+        setup_askpass
+        
+        # Use sudo with askpass for non-interactive installation
+        SUDO_ASKPASS="$ASKPASS_SCRIPT" sudo -A /bin/bash -c "NONINTERACTIVE=1 $(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+        install_result=$?
+        
+        # Cleanup askpass helper
+        cleanup_askpass
+        
+        if [ $install_result -ne 0 ]; then
             printf "%b\n" "${RED}Failed to install Homebrew${RC}"
             exit 1
         fi
+        
+        # Add Homebrew to PATH for the current session
+        if [ -f "/opt/homebrew/bin/brew" ]; then
+            eval "$(/opt/homebrew/bin/brew shellenv)"
+        elif [ -f "/usr/local/bin/brew" ]; then
+            eval "$(/usr/local/bin/brew shellenv)"
+        fi
+        trap cleanup_askpass EXIT INT TERM
     fi
 }