linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-03-27 03:14:56 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/master'

Browse source 
Conflicts:
	plugins/git/git.plugin.zsh
	plugins/jump/jump.plugin.zsh
This commit is contained in:
Gaetan Semet 2015-08-10 16:15:53 +02:00
commit 9a63084e20
82 changed files with 2488 additions and 966 deletions
Download patch file Download diff file Expand all files Collapse all files

5
tools/check_for_upgrade.sh
View file

@ -41,10 +41,9 @@ then
then
_upgrade_zsh
else
echo "[Oh My Zsh] Would you like to check for updates?"
echo "Type Y to update oh-my-zsh: \c"
echo "[Oh My Zsh] Would you like to check for updates? [Y/n]: \c"
read line
if [ "$line" = Y ] || [ "$line" = y ]; then
if [ "$line" = Y ] || [ "$line" = y ] || [ -z "$line" ]; then
_upgrade_zsh
else
_update_zsh_update

6
tools/install.sh
View file

@ -32,10 +32,12 @@ sed -i -e "/export PATH=/ c\\
export PATH=\"$PATH\"
" ~/.zshrc
if [ "$SHELL" != "$(which zsh)" ]; then
TEST_CURRENT_SHELL=$(expr "$SHELL" : '.*/\(.*\)')
if [ "$TEST_CURRENT_SHELL" != "zsh" ]; then
echo "\033[0;34mTime to change your default shell to zsh!\033[0m"
chsh -s `which zsh`
chsh -s $(grep /zsh$ /etc/shells | tail -1)
fi
unset TEST_CURRENT_SHELL
echo "\033[0;32m"' __ __ '"\033[0m"
echo "\033[0;32m"' ____ / /_ ____ ___ __ __ ____ _____/ /_ '"\033[0m"