diff options
| author | Robby Russell <robby@planetargon.com> | 2009-10-26 09:16:19 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2009-10-26 09:16:19 -0700 |
| commit | 58bccaf6fc7532d5ca8040a7c78997847fd10e06 (patch) | |
| tree | f7c42850f5c3d9ab5169d560b5851771d67c6490 /tools | |
| parent | 1779bedd5362c13e3096873c01c167f329e8fca8 (diff) | |
| parent | 886d97f41e72b8662232a2c6b196fb60508e4f67 (diff) | |
| download | zsh-58bccaf6fc7532d5ca8040a7c78997847fd10e06.tar.gz zsh-58bccaf6fc7532d5ca8040a7c78997847fd10e06.tar.bz2 zsh-58bccaf6fc7532d5ca8040a7c78997847fd10e06.zip | |
Fixing merge conflicts 886d97f41e72b8662232a2c6b196fb60508e4f67
Diffstat (limited to 'tools')
| -rwxr-xr-x[-rw-r--r--] | tools/install.sh | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tools/install.sh b/tools/install.sh index 5c9f5592a..5a7c00950 100644..100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -2,11 +2,11 @@ if [ -d ~/.oh-my-zsh ] then echo "You already have Oh My Zsh installed. You'll need to remove ~/.oh-my-zsh if you want to install" exit -else - echo "Cloning Oh My Zsh..." - /usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh fi +echo "Cloning Oh My Zsh..." +/usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh + echo "Looking for an existing zsh config..." if [ -f ~/.zshrc ] || [ -h ~/.zshrc ] then @@ -27,4 +27,3 @@ chsh -s /bin/zsh echo "Hooray! Oh My Zsh has been installed." /bin/zsh source ~/.zshrc - |