Merged upstream commits

This commit is contained in:
David Robertson 2012-10-21 01:21:36 +01:00
commit 1c9994023e
59 changed files with 1131 additions and 66 deletions

View file

@ -5,7 +5,12 @@ then
fi
echo "\033[0;34mCloning Oh My Zsh...\033[0m"
/usr/bin/env git clone https://github.com/DavidJRobertson/oh-my-zsh.git ~/.oh-my-zsh
hash git >/dev/null && /usr/bin/env git clone https://github.com/DavidJRobertson/oh-my-zsh.git ~/.oh-my-zsh || {
echo "git not installed"
exit
}
echo "\033[0;34mLooking for an existing zsh config...\033[0m"
if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]