linux/ohmyzsh
1
0
Fork 0
mirror of https://github.com/ohmyzsh/ohmyzsh.git synced 2026-02-06 02:51:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge fd1e0660b3 into b6ea876971

Browse source
This commit is contained in:
Bob Maerten 2013-04-24 02:44:41 -07:00
commit 1f051689d0
3 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/functions.zsh
View file

@ -7,7 +7,7 @@ function uninstall_oh_my_zsh() {
} }
function upgrade_oh_my_zsh() { function upgrade_oh_my_zsh() {
/usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh /usr/bin/env ZSH=$ZSH /bin/bash $ZSH/tools/upgrade.sh
} }
function take() { function take() {

2
tools/check_for_upgrade.sh
View file

@ -9,7 +9,7 @@ function _update_zsh_update() {
} }
function _upgrade_zsh() { function _upgrade_zsh() {
/usr/bin/env ZSH=$ZSH /bin/sh $ZSH/tools/upgrade.sh /usr/bin/env ZSH=$ZSH /bin/bash $ZSH/tools/upgrade.sh
# update the zsh file # update the zsh file
_update_zsh_update _update_zsh_update
} }

3
tools/upgrade.sh
View file

@ -3,8 +3,9 @@ current_path=${current_path/ /\\ }
printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh" printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
cd "$ZSH" cd "$ZSH"
if git pull origin master if git fetch origin
then then
git rebase origin/master
printf '\033[0;32m%s\033[0m\n' ' __ __ ' printf '\033[0;32m%s\033[0m\n' ' __ __ '
printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '
printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ ' printf '\033[0;32m%s\033[0m\n' ' / __ \/ __ \ / __ `__ \/ / / / /_ / / ___/ __ \ '