diff options
| author | Sébastien M-B <essembeh@gmail.com> | 2013-02-08 19:08:06 +0100 |
|---|---|---|
| committer | Sébastien M-B <essembeh@gmail.com> | 2013-02-08 19:08:06 +0100 |
| commit | 2595484a97d85496fdcdca99a23f52eecd9b1b43 (patch) | |
| tree | fffe23d53a2a635f0861047fb058c8a2632414f7 /tools/install.sh | |
| parent | 8d23a3611086e9a13e7ad754c57fa8cc4797bfa9 (diff) | |
| parent | 6e6cf4303712befb5a7fc3918494aefe4a65991f (diff) | |
| download | zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.tar.gz zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.tar.bz2 zsh-2595484a97d85496fdcdca99a23f52eecd9b1b43.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
lib/aliases.zsh
Diffstat (limited to 'tools/install.sh')
| -rwxr-xr-x | tools/install.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/install.sh b/tools/install.sh index b080be3a1..41f83e354 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -13,9 +13,8 @@ hash git >/dev/null && /usr/bin/env git clone https://github.com/robbyrussell/oh 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;32]Backing up to ~/.zshrc.pre-oh-my-zsh\033[0m"; - cp ~/.zshrc ~/.zshrc.pre-oh-my-zsh; - rm ~/.zshrc; + echo "\033[0;33mFound ~/.zshrc.\033[0m \033[0;32mBacking up to ~/.zshrc.pre-oh-my-zsh\033[0m"; + 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" |