From 3cc1fa40466ea5cee134e6e780786f4fba7eef4f Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Thu, 21 Nov 2019 19:10:30 +0100 Subject: Fix non-POSIX conditional syntax Fixes #8416 --- tools/upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tools') diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 55768cd6e..3005e6542 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -33,7 +33,7 @@ git config receive.fsck.zeroPaddedFilemode ignore # Update upstream remote to ohmyzsh org remote=$(git remote -v | awk '/https:\/\/github\.com\/robbyrussell\/oh-my-zsh\.git/{ print $1; exit }') -if [[ -n "$remote" ]]; then +if [ -n "$remote" ]; then git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git" fi -- cgit v1.2.3-70-g09d2 From 4deafdff962eca8739e321113f5ba338d3990756 Mon Sep 17 00:00:00 2001 From: Giuseppe Date: Mon, 25 Nov 2019 16:36:33 +0100 Subject: Fix change to old shell on uninstall (#8430) If there's no `~/.shell.pre-oh-my-zsh`, don't assume the default choice is Bash. In fact Zsh is the default shell for macOS since Catalina (10.15) [1], yet users of other OSes have likely to have Bash as their default. This commit fix issue #8252 [1] https://support.apple.com/en-us/HT208050 --- tools/uninstall.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'tools') diff --git a/tools/uninstall.sh b/tools/uninstall.sh index da31a6a14..b327a0163 100644 --- a/tools/uninstall.sh +++ b/tools/uninstall.sh @@ -25,18 +25,14 @@ if [ -e "$ZSHRC_ORIG" ]; then echo "Your original zsh config was restored." fi -if hash chsh >/dev/null 2>&1; then - if [ -f ~/.shell.pre-oh-my-zsh ]; then - old_shell=$(cat ~/.shell.pre-oh-my-zsh) - else - old_shell=/bin/bash - fi +if hash chsh >/dev/null 2>&1 && [ -f ~/.shell.pre-oh-my-zsh ]; then + old_shell=$(cat ~/.shell.pre-oh-my-zsh) echo "Switching your shell back to '$old_shell':" if chsh -s "$old_shell"; then rm -f ~/.shell.pre-oh-my-zsh else echo "Could not change default shell. Change it manually by running chsh" - echo "or editing the /etc/passwd file." + echo "or editing the /etc/passwd file." fi fi -- cgit v1.2.3-70-g09d2