diff --git a/home/.chezmoiscripts/universal/run_before_02-homebrew.sh.tmpl b/home/.chezmoiscripts/universal/run_before_02-homebrew.sh.tmpl index 5c500508..382ecad3 100644 --- a/home/.chezmoiscripts/universal/run_before_02-homebrew.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_before_02-homebrew.sh.tmpl @@ -124,7 +124,7 @@ upgradeDarwin() { fi ### Prompt for SUDO_PASSWORD - if [ "$SUDO_PASSWORD" = "" ]; then + if [ -z "$SUDO_PASSWORD" ] || [ "$SUDO_PASSWORD" = "" ]; then logg prompt "Enter the current user's login / admin password. Press ENTER to bypass and skip enabling auto-login. If you would like to bypass this prompt next time then pass in the password as an environment variable named SUDO_PASSWORD before running the kickstart script." SUDO_PASSWORD="$(gum input --password --placeholder="Enter password..")" export SUDO_PASSWORD diff --git a/home/.chezmoiscripts/universal/run_before_03-decrypt-age-key.sh.tmpl b/home/.chezmoiscripts/universal/run_before_03-decrypt-age-key.sh.tmpl index a33778ed..ae3cdb1c 100644 --- a/home/.chezmoiscripts/universal/run_before_03-decrypt-age-key.sh.tmpl +++ b/home/.chezmoiscripts/universal/run_before_03-decrypt-age-key.sh.tmpl @@ -54,8 +54,8 @@ installAge() { # @description Helper function utilized by [[decryptKey]] to ensure the `expect` command is available installExpect() { - if ! command -v expect > /dev/null; then - logg info 'Running brew install expect' + if ! command -v unbuffer > /dev/null; then + logg info 'Running brew install expect / unbuffer' brew install --quiet expect fi }