From f28015d7461a6be4effa5c94761cb6e3c116c16b Mon Sep 17 00:00:00 2001 From: 5ouma <101255979+5ouma@users.noreply.github.com> Date: Tue, 2 Jan 2024 12:11:02 +0900 Subject: [PATCH] fix(setup): Set `$SHELL` when it's empty Move the operation from GitHub Actions YAML file to setup. --- .github/workflows/detail-test.yml | 1 - .github/workflows/test.yml | 1 - setup | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/detail-test.yml b/.github/workflows/detail-test.yml index b98f2563..f488c3c3 100644 --- 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 index 7caca5b7..7eae0756 100644 --- 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 index bd733f7c..f9f9e27d 100755 --- 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'