# load our function and completion directories
for fdir in /usr/share/grml/zsh/completion /usr/share/grml/zsh/functions; do
fpath=( ${fdir} ${fdir}/**/*(/N) ${fpath} )
- if [[ ${fdir} == '/usr/share/grml/zsh/functions' ]] ; then
- for func in ${fdir}/**/[^_]*[^~](N.) ; do
- zrcautoload ${func:t}
- done
- fi
done
-unset fdir func
+typeset -aU ffiles
+ffiles=(/usr/share/grml/zsh/functions/**/[^_]*[^~](N.:t))
+(( ${#ffiles} > 0 )) && autoload -U "${ffiles[@]}"
+unset -v fdir ffiles
# support colors in less
export LESS_TERMCAP_mb=$'\E[01;31m'
#m# k ESC-h Call \kbd{run-help} for the 1st word on the command line
alias run-help >&/dev/null && unalias run-help
-for rh in run-help{,-git,-svk,-svn}; do
+for rh in run-help{,-git,-ip,-openssl,-p4,-sudo,-svk,-svn}; do
zrcautoload $rh
done; unset rh
fi
}
-function grml_typeset_and_wrap () {
+function grml_wrap_reply () {
emulate -L zsh
local target="$1"
local new="$2"
local right="$4"
if (( ${+parameters[$new]} )); then
- typeset -g "${target}=${(P)target}${left}${(P)new}${right}"
+ REPLY="${left}${(P)new}${right}"
+ else
+ REPLY=''
fi
}
function grml_prompt_addto () {
emulate -L zsh
local target="$1"
- local lr it apre apost new v
+ local lr it apre apost new v REPLY
local -a items
shift
|| apost=${grml_prompt_post_default[$it]}
zstyle -s ":prompt:${grmltheme}:${lr}:items:$it" token new \
|| new=${grml_prompt_token_default[$it]}
- typeset -g "${target}=${(P)target}${apre}"
if (( ${+grml_prompt_token_function[$it]} )); then
${grml_prompt_token_function[$it]} $it
- typeset -g "${target}=${(P)target}${REPLY}"
else
case $it in
battery)
- grml_typeset_and_wrap $target $new '' ''
+ grml_wrap_reply $target $new '' ''
;;
change-root)
- grml_typeset_and_wrap $target $new '(' ')'
+ grml_wrap_reply $target $new '(' ')'
;;
grml-chroot)
if [[ -n ${(P)new} ]]; then
- typeset -g "${target}=${(P)target}(CHROOT)"
+ REPLY="$CHROOT"
+ else
+ REPLY=''
fi
;;
vcs)
vcscalled=1
fi
if (( ${+parameters[$v]} )) && [[ -n "${(P)v}" ]]; then
- typeset -g "${target}=${(P)target}${(P)v}"
+ REPLY="${(P)v}"
+ else
+ REPLY=''
fi
;;
- *) typeset -g "${target}=${(P)target}${new}" ;;
+ *) REPLY="$new" ;;
esac
fi
- typeset -g "${target}=${(P)target}${apost}"
+ # Strip volatile characters per item. This is off by default. See the
+ # global stripping code a few lines below for details.
+ if [[ -o prompt_subst ]] && zstyle -t ":prompt:${grmltheme}:${lr}:items:$it" \
+ strip-sensitive-characters
+ then
+ REPLY="${REPLY//[$\`]/}"
+ fi
+ typeset -g "${target}=${(P)target}${apre}${REPLY}${apost}"
done
+
+ # Per default, strip volatile characters (in the prompt_subst case)
+ # globally. If the option is off, the style has no effect. For more
+ # control, this can be turned off and stripping can be configured on a
+ # per-item basis (see above).
+ if [[ -o prompt_subst ]] && zstyle -T ":prompt:${grmltheme}:${lr}:setup" \
+ strip-sensitive-characters
+ then
+ typeset -g "${target}=${${(P)target}//[$\`]/}"
+ fi
}
function prompt_grml_precmd () {
alias acsh='apt-cache show'
#a3# Execute \kbd{apt-cache policy}
alias acp='apt-cache policy'
- #a3# Execute \kbd{apt-get dist-upgrade}
- salias adg="apt-get dist-upgrade"
- #a3# Execute \kbd{apt-get install}
- salias agi="apt-get install"
+ if check_com -c apt ; then
+ #a3# Execute \kbd{apt dist-upgrade}
+ salias adg="apt dist-upgrade"
+ #a3# Execute \kbd{apt upgrade}
+ salias ag="apt upgrade"
+ #a3# Execute \kbd{apt install}
+ salias agi="apt install"
+ #a3# Execute \kbd{apt-get update}
+ salias au="apt update"
+ else
+ salias adg="apt-get dist-upgrade"
+ salias ag="apt-get upgrade"
+ salias agi="apt-get install"
+ salias au="apt-get update"
+ fi
#a3# Execute \kbd{aptitude install}
salias ati="aptitude install"
- #a3# Execute \kbd{apt-get upgrade}
- salias ag="apt-get upgrade"
- #a3# Execute \kbd{apt-get update}
- salias au="apt-get update"
#a3# Execute \kbd{aptitude update ; aptitude safe-upgrade}
salias -a up="aptitude update ; aptitude safe-upgrade"
#a3# Execute \kbd{dpkg-buildpackage}
fi
local file jumpd curdir
- local -i RTN LINODE i
- local -a SEENINODES
+ local -i 10 RTN LINODE i
+ local -a SEENINODES
curdir="${PWD}"
RTN=0
LINODE=$(zstat -L +inode "${file}")
for i in ${SEENINODES} ; do
if (( ${i} == ${LINODE} )) ; then
- builtin cd "${curdir}"
- print "link loop detected, aborting!"
+ builtin cd -q "${curdir}"
+ print 'link loop detected, aborting!'
return 2
fi
done
file="${file:t}"
if [[ -d ${jumpd} ]] ; then
- builtin cd "${jumpd}" || RTN=1
+ builtin cd -q "${jumpd}" || RTN=1
fi
file=$(readlink "$file")
file="${file:t}"
if [[ -d ${jumpd} ]] ; then
- builtin cd "${jumpd}" || RTN=1
+ builtin cd -q "${jumpd}" || RTN=1
fi
ls -l "${PWD}/${file}" || RTN=1
if (( ${#} >= 1 )) ; then
print ""
fi
- builtin cd "${curdir}"
+ builtin cd -q "${curdir}"
done
return ${RTN}
}
}
# make sure our environment is clean regarding colors
-builtin unset -v BLUE RED GREEN CYAN YELLOW MAGENTA WHITE
+builtin unset -v BLUE RED GREEN CYAN YELLOW MAGENTA WHITE NO_COLOR
# "persistent history"
# just write important commands you always need to $GRML_IMPORTANT_COMMANDS