Browse Source

fix(uninstall): fix renaming .zshrc when no original rc file found

Fixes #9629
Fixes #9700
Marc Cornellà 3 years ago
parent
commit
e8716cb570
1 changed files with 8 additions and 8 deletions
  1. 8 8
      tools/uninstall.sh

+ 8 - 8
tools/uninstall.sh

@@ -9,20 +9,20 @@ if [ -d ~/.oh-my-zsh ]; then
   rm -rf ~/.oh-my-zsh
 fi
 
+if [ -e ~/.zshrc ]; then
+  ZSHRC_SAVE=~/.zshrc.omz-uninstalled-$(date +%Y-%m-%d_%H-%M-%S)
+  echo "Found ~/.zshrc -- Renaming to ${ZSHRC_SAVE}"
+  mv ~/.zshrc "${ZSHRC_SAVE}"
+fi
+
 echo "Looking for original zsh config..."
 ZSHRC_ORIG=~/.zshrc.pre-oh-my-zsh
 if [ -e "$ZSHRC_ORIG" ]; then
   echo "Found $ZSHRC_ORIG -- Restoring to ~/.zshrc"
-
-  if [ -e ~/.zshrc ]; then
-    ZSHRC_SAVE=~/.zshrc.omz-uninstalled-$(date +%Y-%m-%d_%H-%M-%S)
-    echo "Found ~/.zshrc -- Renaming to ${ZSHRC_SAVE}"
-    mv ~/.zshrc "${ZSHRC_SAVE}"
-  fi
-
   mv "$ZSHRC_ORIG" ~/.zshrc
-
   echo "Your original zsh config was restored."
+else
+  echo "No original zsh config found"
 fi
 
 if hash chsh >/dev/null 2>&1 && [ -f ~/.shell.pre-oh-my-zsh ]; then