From dfbafe6d58bf1463df393fd4478154be36a675aa Mon Sep 17 00:00:00 2001
From: Probably Not <probablynot@gmail.com>
Date: Sat, 4 Aug 2012 11:41:47 -0700
Subject: Fixing conflict in install scripts

---
 tools/uninstall.sh | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

(limited to 'tools/uninstall.sh')

diff --git a/tools/uninstall.sh b/tools/uninstall.sh
index 8ff583322..41d601576 100644
--- a/tools/uninstall.sh
+++ b/tools/uninstall.sh
@@ -4,12 +4,20 @@ then
   rm -rf ~/.oh-my-zsh
 fi
 
-echo "Looking for an existing zsh config..."
+echo "Looking for original zsh config..."
 if [ -f ~/.zshrc.pre-oh-my-zsh ] || [ -h ~/.zshrc.pre-oh-my-zsh ]
 then
-  echo "Found ~/.zshrc. Backing up to ~/.zshrc.pre-oh-my-zsh";
-  rm ~/.zshrc;
-  cp ~/.zshrc.pre-oh-my-zsh ~/.zshrc;
+  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`";
+    echo "Found ~/.zshrc -- Renaming to ~/${ZSHRC_SAVE}";
+    mv ~/.zshrc ~/${ZSHRC_SAVE};
+  fi
+
+  mv ~/.zshrc.pre-oh-my-zsh ~/.zshrc;
+
   source ~/.zshrc;
 else
   echo "Switching back to bash"
@@ -17,4 +25,4 @@ else
   source /etc/profile
 fi
 
-echo "Thanks for trying out Oh My Zsh. It's been uninstalled."
\ No newline at end of file
+echo "Thanks for trying out Oh My Zsh. It's been uninstalled."
-- 
cgit v1.2.3-70-g09d2