fix(setup): Set $SHELL when it's empty

Move the operation from GitHub Actions YAML file to setup.
5ouma · Jan 2, 2024 · f28015d · f28015d
1 parent e6022f0
commit f28015d
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/detail-test.yml b/.github/workflows/detail-test.yml
@@ -34,7 +34,6 @@ jobs:
 
       - name: Run setup
         env:
-          SHELL: "null"
           SETUP_SKIP_installDavinciResolve: true
           SETUP_SKIP_loginGitHubCli: true
           HOMEBREW_BUNDLE_MAS_SKIP: ${{ steps.skip.outputs.HOMEBREW_BUNDLE_MAS_SKIP }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -35,7 +35,6 @@ jobs:
 
       - name: Run setup
         env:
-          SHELL: "null"
           SETUP_SKIP_installApps: true
           SETUP_SKIP_installDavinciResolve: true
           SETUP_SKIP_loginGitHubCli: true

diff --git a/setup b/setup
@@ -279,7 +279,7 @@ installApps() {
 } && run 'installApps' '## 📲 Install commands and apps'
 
 changeLoginShell() {
-  [ "$SHELL" = "$(which zsh)" ] && return 2
+  [ "${SHELL:-""}" = "$(which zsh)" ] && return 2
   which zsh | sudo tee -a /etc/shells >/dev/null
   sudo chsh -s "$(which zsh)" "$USER"
 } && run 'changeLoginShell' '### 🐚 Change login shell to Zsh'