Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixing conflict in install scripts

  • Loading branch information...
commit dfbafe6d58bf1463df393fd4478154be36a675aa 1 parent d19e01b
@probablynot probablynot authored committed
Showing with 14 additions and 7 deletions.
  1. +1 −2  tools/install.sh
  2. +13 −5 tools/uninstall.sh
View
3  tools/install.sh
@@ -14,8 +14,7 @@ echo "\033[0;34mLooking for an existing zsh config...\033[0m"
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]
then
echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-oh-my-zsh\033[0m";
- cp ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
- rm ~/.zshrc;
+ mv ~/.zshrc ~/.zshrc.pre-oh-my-zsh;
fi
echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
View
18 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."
+echo "Thanks for trying out Oh My Zsh. It's been uninstalled."
Please sign in to comment.
Something went wrong with that request. Please try again.