dfbafe6d58bf1463df393fd4478154be36a675aa

 1diff --git a/tools/install.sh b/tools/install.sh
 2index 6f58db939548daff099ffa0ce10ceef0e69db097..41f83e354389b62e3d2d7d8ce1bd10478de80ee6 100755
 3--- a/tools/install.sh
 4+++ b/tools/install.sh
 5@@ -14,8 +14,7 @@ echo "\033[0;34mLooking for an existing zsh config...\033[0m"
 6 if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
 7 then
 8   echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-oh-my-zsh\033[0m";
 9-  cp ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
10-  rm ~/.zshrc;
11+  mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
12 fi
13 
14 echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
15diff --git a/tools/uninstall.sh b/tools/uninstall.sh
16index 8ff58332272b2410e3fb25beb18f638771391ffe..41d6015769d4c7a5ef06d087c58f80bf6a07a106 100644
17--- a/tools/uninstall.sh
18+++ b/tools/uninstall.sh
19@@ -4,12 +4,20 @@ then
20   rm -rf ~/.oh-my-zsh
21 fi
22 
23-echo "Looking for an existing zsh config..."
24+echo "Looking for original zsh config..."
25 if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ]
26 then
27-  echo "Found ~/.zshrc. Backing up to ~/.zshrc.pre-oh-my-zsh";
28-  rm ~/.zshrc;
29-  cp ~/.zshrc.pre-oh-my-zsh ~/.zshrc;
30+  echo "Found ~/.zshrc.pre-oh-my-zsh -- Restoring to ~/.zshrc";
31+
32+  if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
33+  then
34+    ZSHRC_SAVE=".zshrc.omz-uninstalled-`date +%Y%m%d%H%M%S`";
35+    echo "Found ~/.zshrc -- Renaming to ~/${ZSHRC_SAVE}";
36+    mv ~/.zshrc ~/${ZSHRC_SAVE};
37+  fi
38+
39+  mv ~/.zshrc.pre-oh-my-zsh ~/.zshrc;
40+
41   source ~/.zshrc;
42 else
43   echo "Switching back to bash"
44@@ -17,4 +25,4 @@ else
45   source /etc/profile
46 fi
47 
48-echo "Thanks for trying out Oh My Zsh. It's been uninstalled."
49+echo "Thanks for trying out Oh My Zsh. It's been uninstalled."