diff options
| -rw-r--r-- | .zlogin | 16 | ||||
| -rw-r--r-- | .zshenv | 4 | ||||
| -rw-r--r-- | .zshrc | 6 |
3 files changed, 13 insertions, 13 deletions
@@ -5,14 +5,14 @@ fi # check to see if git repository has been updated function () { - [ $SHLVL -ne 1 ] && return - if command -v git >|/dev/null && git -C $HOME rev-parse >|/dev/null 2>&1 ; then - local local_head="$(git -C $HOME show-ref --hash --heads master)" - local origin_head="$(GIT_SSH_COMMAND="ssh -o BatchMode=yes -o ConnectTimeout=1" git -C $HOME ls-remote --heads origin master 2>|/dev/null | cut -f1)" - if [ "$local_head" != "$origin_head" -a -n "$origin_head" ];then - print "$fg[blue]--= ${fg[red]}git repository differs from origin$fg[blue] =--$terminfo[sgr0]" - fi - fi + [ $SHLVL -ne 1 ] && return + if command -v git >|/dev/null && git -C $HOME rev-parse >|/dev/null 2>&1 ; then + local local_head="$(git -C $HOME show-ref --hash --heads master)" + local origin_head="$(GIT_SSH_COMMAND="ssh -o BatchMode=yes -o ConnectTimeout=1" git -C $HOME ls-remote --heads origin master 2>|/dev/null | cut -f1)" + if [ "$local_head" != "$origin_head" -a -n "$origin_head" ];then + print "$fg[blue]--= ${fg[red]}git repository differs from origin$fg[blue] =--$terminfo[sgr0]" + fi + fi } # set terminal to clear after logout. @@ -12,12 +12,12 @@ bindkey -e export LESS="-RSMgi" export PAGER='less' if [ -x /usr/bin/lesspipe ]; then - eval $(lesspipe) + eval $(lesspipe) fi # Set COLORTERM for s-lang programs if this is a color terminal if [ "$TERM" = "xterm" -o "$TERM" = "linux" -o "$TERM" = "rxvt" ]; then - export COLORTERM=y + export COLORTERM=y fi # Random environment settings. @@ -9,11 +9,11 @@ function () { # See if we can use colors. autoload colors zsh/terminfo if [[ "$terminfo[colors]" -ge 8 ]]; then - colors + colors fi for color in red green yellow blue magenta cyan white; do - eval local ${color}='%{$fg[${(L)color}]%}' - eval local ${color}_bold='%{$terminfo[bold]$fg[${(L)color}]%}' + eval local ${color}='%{$fg[${(L)color}]%}' + eval local ${color}_bold='%{$terminfo[bold]$fg[${(L)color}]%}' done local nocolor="%{$terminfo[sgr0]%}" |