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

This commit is contained in:
Yin Hou 2013-10-31 10:33:44 -04:00
commit 348ed45318
69 changed files with 2527 additions and 133 deletions

View file

@ -24,7 +24,8 @@ function theme_preview() {
THEME_NAME=`echo $THEME | sed s/\.zsh-theme$//`
print "$fg[blue]${(l.((${COLUMNS}-${#THEME_NAME}-5))..─.)}$reset_color $THEME_NAME $fg[blue]───$reset_color"
source "$THEMES_DIR/$THEME"
print -P $PROMPT
cols=$(tput cols)
print -P "$PROMPT $RPROMPT"
}
function banner() {

View file

@ -1,6 +1,6 @@
printf '\033[0;34m%s\033[0m\n' "Upgrading Oh My Zsh"
cd "$ZSH"
if git pull origin master
if git pull --rebase origin master
then
printf '\033[0;32m%s\033[0m\n' ' __ __ '
printf '\033[0;32m%s\033[0m\n' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ '