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

Fix change to old shell on uninstall (#8430)
4deafdff · Giuseppe · Marc Cornellà · 7b73c9ca · 4deafdff
Commit 4deafdff authored Nov 25, 2019 by Giuseppe Committed by Marc Cornellà Nov 25, 2019
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 5 deletions

uninstall.sh tools/uninstall.sh +1 -5

No files found.
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -25,12 +25,8 @@ 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
+if hash chsh >/dev/null 2>&1 && [ -f ~/.shell.pre-oh-my-zsh ]; then
  old_shell=$(cat ~/.shell.pre-oh-my-zsh)
-  else
-	old_shell=/bin/bash
-  fi
  echo "Switching your shell back to '$old_shell':"
  if chsh -s "$old_shell"; then
    rm -f ~/.shell.pre-oh-my-zsh