Merge pull request #4539 from Gnouc/master

Update uninstall.sh

1 files changed, 8 insertions, 13 deletions

diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index 9ad1b64a6..bf2244be8 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -1,34 +1,29 @@
 read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation
-if [ "$confirmation" != y ] && [ "$confirmation" != Y ]
-then
+if [ "$confirmation" != y ] && [ "$confirmation" != Y ]; then
   echo "Uninstall cancelled"
   exit
 fi
 
 echo "Removing ~/.oh-my-zsh"
-if [ -d ~/.oh-my-zsh ]
-then
+if [ -d ~/.oh-my-zsh ]; then
   rm -rf ~/.oh-my-zsh
 fi
 
 echo "Looking for original zsh config..."
-if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ]
-then
+if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ]; then
   echo "Found ~/.zshrc.pre-oh-my-zsh -- Restoring to ~/.zshrc";
 
-  if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
-  then
-    ZSHRC_SAVE=".zshrc.omz-uninstalled-`date +%Y%m%d%H%M%S`";
+  if [ -f ~/.zshrc ] || [ -h ~/.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};
+    mv ~/.zshrc ~/"${ZSHRC_SAVE}";
   fi
 
   mv ~/.zshrc.pre-oh-my-zsh ~/.zshrc;
 
-  source ~/.zshrc;
+  echo "Your original zsh config was restored. Please restart your session."
 else
-  if hash chsh >/dev/null 2>&1
-  then
+  if hash chsh >/dev/null 2>&1; then
     echo "Switching back to bash"
     chsh -s /bin/bash
   else