X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=aea6d381fbbd44deb991c403ffd41c0e6734f876;hb=refs%2Ftags%2F0.3.46;hp=89beb3678e22138c8f1dc1b5f7f6d601ddca8843;hpb=6eed6ec8a51ca1e9f2f3f826fdfb44d51a64ebf9;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 89beb36..aea6d38 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -307,14 +307,14 @@ isgrml && checkhome() { # }}} # {{{ set some variables -#v# if check_com -c vim ; then +#v# export EDITOR=${EDITOR:-vim} else export EDITOR=${EDITOR:-vi} fi -#v# +#v# export MAIL=${MAIL:-/var/mail/$USER} # if we don't set $SHELL then aterm, rxvt,.. will use /bin/sh or /bin/bash :-/ @@ -1005,7 +1005,7 @@ is4 && [[ -z $NOPRECMD ]] && \ preexec () { [[ -n $NOPRECMD ]] && return 0 # set hostname if not running on host with name 'grml' - if [[ "$HOSTNAME" != $(hostname) ]] ; then + if [[ -n "$HOSTNAME" ]] && [[ "$HOSTNAME" != $(hostname) ]] ; then NAME="@$HOSTNAME" fi # get the name of the program currently running and hostname of local machine