Merge remote-tracking branch 'upstream/master'

Conflicts:
	README.textile
	lib/aliases.zsh
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
	themes/ys.zsh-theme
This commit is contained in:
Gaetan Semet 2015-04-22 18:22:55 +02:00
commit fdbecb80e3
91 changed files with 2617 additions and 598 deletions

View file

@ -10,7 +10,7 @@ if [ -d "$ZSH" ]; then
fi
echo "\033[0;34mCloning Oh My Zsh...\033[0m"
hash git >/dev/null 2>&1 && env git clone https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
hash git >/dev/null 2>&1 && env git clone --depth=1 https://github.com/robbyrussell/oh-my-zsh.git $ZSH || {
echo "git not installed"
exit
}
@ -23,8 +23,8 @@ fi
echo "\033[0;34mUsing the Oh My Zsh template file and adding it to ~/.zshrc\033[0m"
cp $ZSH/templates/zshrc.zsh-template ~/.zshrc
sed -i -e "/^ZSH=/ c\\
ZSH=$ZSH
sed -i -e "/^export ZSH=/ c\\
export ZSH=$ZSH
" ~/.zshrc
echo "\033[0;34mCopying your current PATH and adding it to the end of ~/.zshrc for you.\033[0m"