diff options
| author | Roman Kamyk <roman.kamyk@gmail.com> | 2011-05-12 13:40:07 +0200 |
|---|---|---|
| committer | Roman Kamyk <roman.kamyk@gmail.com> | 2011-05-12 13:40:07 +0200 |
| commit | f71647fa85267d558d0d69034902f53aeeed67ad (patch) | |
| tree | e48c05b9de6c435ccb5df37c6d0a5b4c351b380e /tools | |
| parent | dccfdf7dbf707b2e860fde1b6540e66ec6bda207 (diff) | |
| parent | 0365ef0529ddfb912ca8202773e45916c55fdf4f (diff) | |
| download | zsh-f71647fa85267d558d0d69034902f53aeeed67ad.tar.gz zsh-f71647fa85267d558d0d69034902f53aeeed67ad.tar.bz2 zsh-f71647fa85267d558d0d69034902f53aeeed67ad.zip | |
Merge branch 'master' of http://github.com/robbyrussell/oh-my-zsh
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/check_for_upgrade.sh | 9 | ||||
| -rwxr-xr-x | tools/install.sh | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tools/check_for_upgrade.sh b/tools/check_for_upgrade.sh index 4643739ca..e1e4eb99f 100644 --- a/tools/check_for_upgrade.sh +++ b/tools/check_for_upgrade.sh @@ -25,10 +25,11 @@ then if [ "$line" = Y ] || [ "$line" = y ] then /bin/sh $ZSH/tools/upgrade.sh + # update the zsh file + _update_zsh_update fi fi +else + # create the zsh file + _update_zsh_update fi - -# update the zsh file -_update_zsh_update - diff --git a/tools/install.sh b/tools/install.sh index 6e3872bb9..8ed1403af 100755 --- a/tools/install.sh +++ b/tools/install.sh @@ -5,7 +5,7 @@ then fi echo "Cloning Oh My Zsh..." -/usr/bin/env git clone git://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh +/usr/bin/env git clone https://github.com/robbyrussell/oh-my-zsh.git ~/.oh-my-zsh echo "Looking for an existing zsh config..." if [ -f ~/.zshrc ] || [ -h ~/.zshrc ] @@ -22,7 +22,7 @@ echo "Copying your current PATH and adding it to the end of ~/.zshrc for you." echo "export PATH=$PATH" >> ~/.zshrc echo "Time to change your default shell to zsh!" -chsh -s "/usr/bin/env zsh" +chsh -s `which zsh` echo ' __ __ ' echo ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' |