linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2025-12-26 02:12:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
Conflicts:
	lib/key-bindings.zsh
	plugins/git-flow/git-flow.plugin.zsh
	plugins/github/github.plugin.zsh
	tools/check_for_upgrade.sh
This commit is contained in:
Sven Lito 2011-05-14 11:23:30 +01:00
commit 1954b5550e
38 changed files with 822 additions and 224 deletions
Download patch file Download diff file Expand all files Collapse all files

8
tools/check_for_upgrade.sh
View file

@ -25,9 +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

4
tools/install.sh
View file

@ -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 ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '