Merge branch 'master' of git://github.com/robbyrussell/oh-my-zsh

This commit is contained in:
David Robertson 2013-05-10 01:18:06 +01:00
commit 1fdb64e6d9
71 changed files with 1968 additions and 240 deletions

View file

@ -23,7 +23,7 @@ echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[
cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"
echo "export PATH=$PATH" >> ~/.zshrc
echo "export PATH=\$PATH:$PATH" >> ~/.zshrc
echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
chsh -s `which zsh`

View file

@ -1,6 +1,7 @@
current_path=`pwd`
current_path=${current_path/ /\\ }
printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
cd $ZSH
cd "$ZSH"
if git pull origin master
then
@ -16,4 +17,4 @@ else
printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?'
fi
cd "$current_path"
cd "$current_path"