diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/theme_chooser.sh | 3 | ||||
| -rw-r--r-- | tools/upgrade.sh | 6 |
2 files changed, 3 insertions, 6 deletions
diff --git a/tools/theme_chooser.sh b/tools/theme_chooser.sh index 4d7047444..2c2a379ba 100755 --- a/tools/theme_chooser.sh +++ b/tools/theme_chooser.sh @@ -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() { diff --git a/tools/upgrade.sh b/tools/upgrade.sh index 0aeebdebf..e04fc672f 100644 --- a/tools/upgrade.sh +++ b/tools/upgrade.sh @@ -1,9 +1,6 @@ -current_path=`pwd` -current_path=${current_path/ /\\ } 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' ' ____ / /_ ____ ___ __ __ ____ _____/ /_ ' @@ -17,4 +14,3 @@ else printf '\033[0;31m%s\033[0m\n' 'There was an error updating. Try again later?' fi -cd "$current_path" |