X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=f7c332b624d2f03c0299d155e4846f5a209c8983;hb=b5070ac43c7fc3a280526aaa172a901862198c8b;hp=9f3d87a94e8e5d46b8460891edaa7f56dd7aeda2;hpb=9663863a1c17ded15cc687a06ede6305a6e48b26;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 9f3d87a..f7c332b 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -11,6 +11,18 @@ # Global Order: zshenv, zprofile, zshrc, zlogin ################################################################################ +# Contributing: +# If you want to help to improve grml's zsh setup, clone the grml-etc-core +# repository from git.grml.org: +# git clone git://git.grml.org/grml-etc-core.git +# +# Make your changes, commit them; use 'git format-patch' to create a series +# of patches and send those to the following address via 'git send-email': +# grml-etc-core@grml.org +# +# Doing so makes sure the right people get your patches for review and +# possibly inclusion. + # zsh-refcard-tag documentation: {{{ # You may notice strange looking comments in this file. # These are there for a purpose. grml's zsh-refcard can now be @@ -121,6 +133,11 @@ is43(){ return 1 } +is433(){ + [[ $ZSH_VERSION == 4.3.<3->* || $ZSH_VERSION == <5->* ]] && return 0 + return 1 +} + #f1# Checks whether or not you're running grml isgrml(){ [[ -f /etc/grml_version ]] && return 0 @@ -199,11 +216,12 @@ fi # We need to define this function as early as this, because autoloading # 'is-at-least()' needs it. function zrcautoload() { - setopt local_options extended_glob + emulate -L zsh + setopt extended_glob local fdir ffile local -i ffound - ffile=${1} + ffile=$1 (( found = 0 )) for fdir in ${fpath} ; do [[ -e ${fdir}/${ffile} ]] && (( ffound = 1 )) @@ -225,14 +243,53 @@ zrcautoload is-at-least || is-at-least() { return 1 } # }}} +# {{{ set some important options (as early as possible) +# Please update these tags, if you change the umask settings below. +#o# r_umask 002 +#o# r_umaskstr rwxrwxr-x +#o# umask 022 +#o# umaskstr rwxr-xr-x +(( EUID != 0 )) && umask 002 || umask 022 + +setopt append_history # append history list to the history file (important for multiple parallel zsh sessions!) +is4 && setopt SHARE_HISTORY # import new commands from the history file also in other zsh-session +setopt extended_history # save each command's beginning timestamp and the duration to the history file +is4 && setopt histignorealldups # If a new command line being added to the history + # list duplicates an older one, the older command is removed from the list +setopt histignorespace # remove command lines from the history list when + # the first character on the line is a space +setopt auto_cd # if a command is issued that can't be executed as a normal command, + # and the command is the name of a directory, perform the cd command to that directory +setopt extended_glob # in order to use #, ~ and ^ for filename generation + # grep word *~(*.gz|*.bz|*.bz2|*.zip|*.Z) -> + # -> searches for word not in compressed files + # don't forget to quote '^', '~' and '#'! +setopt longlistjobs # display PID when suspending processes as well +setopt notify # report the status of backgrounds jobs immediately +setopt hash_list_all # Whenever a command completion is attempted, make sure \ + # the entire command path is hashed first. +setopt completeinword # not just at the end +setopt nohup # and don't kill them, either +setopt auto_pushd # make cd push the old directory onto the directory stack. +setopt nonomatch # try to avoid the 'zsh: no matches found...' +setopt nobeep # avoid "beep"ing +setopt pushd_ignore_dups # don't push the same dir twice. +setopt noglobdots # * shouldn't match dotfiles. ever. +setopt noshwordsplit # use zsh style word splitting + +# }}} + # setting some default values {{{ NOCOR=${NOCOR:-0} NOMENU=${NOMENU:-0} NOPRECMD=${NOPRECMD:-0} +COMMAND_NOT_FOUND=${COMMAND_NOT_FOUND:-0} +GRML_ZSH_CNF_HANDLER=${GRML_ZSH_CNF_HANDLER:-/usr/share/command-not-found/command-not-found} BATTERY=${BATTERY:-0} GRMLSMALL_SPECIFIC=${GRMLSMALL_SPECIFIC:-1} GRML_ALWAYS_LOAD_ALL=${GRML_ALWAYS_LOAD_ALL:-0} +ZSH_NO_DEFAULT_LOCALE=${ZSH_NO_DEFAULT_LOCALE:-0} if isgrmlcd ; then GRML_WARN_SKEL=${GRML_WARN_SKEL:-0} @@ -313,14 +370,21 @@ fi # GRML_WARN_SKEL # this function checks if a command exists and returns either true # or false. This avoids using 'which' and 'whence', which will # avoid problems with aliases for which on certain weird systems. :-) +# Usage: check_com [-c|-g] word +# -c only checks for external commands +# -g does the usual tests and also checks for global aliases check_com() { - local -i comonly + emulate -L zsh + local -i comonly gatoo - if [[ ${1} == '-c' ]] ; then + if [[ $1 == '-c' ]] ; then (( comonly = 1 )) shift + elif [[ $1 == '-g' ]] ; then + (( gatoo = 1 )) else (( comonly = 0 )) + (( gatoo = 0 )) fi if (( ${#argv} != 1 )) ; then @@ -341,15 +405,20 @@ check_com() { return 0 fi + if (( gatoo > 0 )) && [[ -n ${galiases[$1]} ]] ; then + return 0 + fi + return 1 } # creates an alias and precedes the command with # sudo if $EUID is not zero. salias() { + emulate -L zsh local only=0 ; local multi=0 - while [[ ${1} == -* ]] ; do - case ${1} in + while [[ $1 == -* ]] ; do + case $1 in (-o) only=1 ;; (-a) multi=1 ;; (--) shift ; break ;; @@ -361,7 +430,7 @@ salias() { printf ' -o only sets an alias if a preceding sudo would be needed.\n' return 0 ;; - (*) printf "unkown option: '%s'\n" "${1}" ; return 1 ;; + (*) printf "unkown option: '%s'\n" "$1" ; return 1 ;; esac shift done @@ -388,9 +457,10 @@ salias() { # Note that foo is no typo; $foo would be wrong here! if ! is42 ; then uprint () { + emulate -L zsh local -a u local w - local parameter=${1} + local parameter=$1 if [[ -z ${parameter} ]] ; then printf 'usage: uprint \n' @@ -398,22 +468,23 @@ if ! is42 ; then fi for w in ${(P)parameter} ; do - [[ -z ${(M)u:#${w}} ]] && u=( ${u} ${w} ) + [[ -z ${(M)u:#$w} ]] && u=( $u $w ) done - builtin print -l ${u} + builtin print -l $u } fi # Check if we can read given files and source those we can. xsource() { + emulate -L zsh if (( ${#argv} < 1 )) ; then printf 'usage: xsource FILE(s)...\n' >&2 return 1 fi while (( ${#argv} > 0 )) ; do - [[ -r ${1} ]] && source ${1} + [[ -r $1 ]] && source $1 shift done return 0 @@ -421,18 +492,20 @@ xsource() { # Check if we can read a given file and 'cat(1)' it. xcat() { + emulate -L zsh if (( ${#argv} != 1 )) ; then printf 'usage: xcat FILE\n' >&2 return 1 fi - [[ -r ${1} ]] && cat ${1} + [[ -r $1 ]] && cat $1 return 0 } # Remove these functions again, they are of use only in these # setup files. This should be called at the end of .zshrc. xunfunction() { + emulate -L zsh local -a funcs funcs=(salias xcat xsource xunfunction zrcautoload) @@ -443,15 +516,22 @@ xunfunction() { return 0 } +# this allows us to stay in sync with grml's zshrc and put own +# modifications in ~/.zshrc.local +zrclocal() { + xsource "/etc/zsh/zshrc.local" + xsource "${HOME}/.zshrc.local" + return 0 +} + #}}} # locale setup {{{ -if [[ -z "$LANG" ]] ; then - xsource "/etc/default/locale" +if (( ZSH_NO_DEFAULT_LOCALE == 0 )); then + xsource "/etc/default/locale" fi -export LANG=${LANG:-en_US.iso885915} -for var in LC_ALL LC_MESSAGES ; do +for var in LANG LC_ALL LC_MESSAGES ; do [[ -n ${(P)var} ]] && export $var done @@ -518,20 +598,29 @@ fi # do Fink setup on darwin isdarwin && xsource /sw/bin/init.sh -# completion functions go to /etc/zsh/completion.d -# function files may be put into /etc/zsh/functions.d, from where they -# will be automatically autoloaded. -if [[ -n "$BROKEN_COMPLETION_DIR" ]] ; then - print 'Warning: not setting completion directories because broken files have been found.' >&2 -else - [[ -d /etc/zsh/completion.d ]] && fpath=( $fpath /etc/zsh/completion.d ) - if [[ -d /etc/zsh/functions.d ]] ; then - fpath+=( /etc/zsh/functions.d ) - for func in /etc/zsh/functions.d/[^_]*[^~](N.) ; do - zrcautoload -U ${func:t} +# load our function and completion directories +for fdir in /usr/share/grml/zsh/completion /usr/share/grml/functions; do + fpath=( ${fdir} ${fdir}/**/*(/N) ${fpath} ) + if [[ ${fpath} == '/usr/share/grml/zsh/functions' ]] ; then + for func in ${fdir}/**/[^_]*[^~](N.) ; do + zrcautoload ${func:t} done fi -fi +done +unset fdir func + +# support colors in less +export LESS_TERMCAP_mb=$'\E[01;31m' +export LESS_TERMCAP_md=$'\E[01;31m' +export LESS_TERMCAP_me=$'\E[0m' +export LESS_TERMCAP_se=$'\E[0m' +export LESS_TERMCAP_so=$'\E[01;44;33m' +export LESS_TERMCAP_ue=$'\E[0m' +export LESS_TERMCAP_us=$'\E[01;32m' + +MAILCHECK=30 # mailchecks +REPORTTIME=5 # report about cpu-/system-/user-time of command if running longer than 5 seconds +watch=(notme root) # watch for everyone but me and root # automatically remove duplicates from these arrays typeset -U path cdpath fpath manpath @@ -621,6 +710,25 @@ grml_toggle_abbrev() { zle -N grml_toggle_abbrev bindkey '^xA' grml_toggle_abbrev +# add a command line to the shells history without executing it +commit-to-history() { + print -s ${(z)BUFFER} + zle send-break +} +zle -N commit-to-history +bindkey "^x^h" commit-to-history + +# only slash should be considered as a word separator: +slash-backward-kill-word() { + local WORDCHARS="${WORDCHARS:s@/@}" + # zle backward-word + zle backward-kill-word +} +zle -N slash-backward-kill-word + +#k# Kill everything in a word up to its last \kbd{/} +bindkey '\ev' slash-backward-kill-word + # }}} # a generic accept-line wrapper {{{ @@ -774,79 +882,31 @@ declare -A abk setopt extendedglob setopt interactivecomments abk=( -# key # value (#d additional doc string) +# key # value (#d additional doc string) #A# start - '...' '../..' + '...' '../..' '....' '../../..' - 'BG' '& exit' - 'C' '| wc -l' - 'G' '|& grep --color=auto' - 'H' '| head' - 'Hl' ' --help |& less -r' #d (Display help in pager) - 'L' '| less' - 'LL' '|& less -r' - 'M' '| most' - 'N' '&>/dev/null' #d (No Output) - 'R' '| tr A-z N-za-m' #d (ROT13) - 'SL' '| sort | less' - 'S' '| sort -u' - 'T' '| tail' - 'V' '|& vim -' + 'BG' '& exit' + 'C' '| wc -l' + 'G' '|& grep --color=auto ' + 'H' '| head' + 'Hl' ' --help |& less -r' #d (Display help in pager) + 'L' '| less' + 'LL' '|& less -r' + 'M' '| most' + 'N' '&>/dev/null' #d (No Output) + 'R' '| tr A-z N-za-m' #d (ROT13) + 'SL' '| sort | less' + 'S' '| sort -u' + 'T' '| tail' + 'V' '|& vim -' #A# end - 'hide' "echo -en '\033]50;nil2\007'" - 'tiny' 'echo -en "\033]50;-misc-fixed-medium-r-normal-*-*-80-*-*-c-*-iso8859-15\007"' - 'small' 'echo -en "\033]50;6x10\007"' - 'medium' 'echo -en "\033]50;-misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15\007"' - 'default' 'echo -e "\033]50;-misc-fixed-medium-r-normal-*-*-140-*-*-c-*-iso8859-15\007"' - 'large' 'echo -en "\033]50;-misc-fixed-medium-r-normal-*-*-150-*-*-c-*-iso8859-15\007"' - 'huge' 'echo -en "\033]50;-misc-fixed-medium-r-normal-*-*-210-*-*-c-*-iso8859-15\007"' - 'smartfont' 'echo -en "\033]50;-artwiz-smoothansi-*-*-*-*-*-*-*-*-*-*-*-*\007"' - 'semifont' 'echo -en "\033]50;-misc-fixed-medium-r-semicondensed-*-*-120-*-*-*-*-iso8859-15\007"' - 'da' 'du -sch' - 'j' 'jobs -l' - 'u' 'translate -i' - 'co' "./configure && make && sudo make install" - 'CH' "./configure --help" - 'conkeror' 'firefox -chrome chrome://conkeror/content' - 'dir' 'ls -lSrah' - 'lad' $'ls -d .*(/)\n# only show dot-directories' - 'lsa' $'ls -a .*(.)\n# only show dot-files' - 'lss' $'ls -l *(s,S,t)\n# only files with setgid/setuid/sticky flag' - 'lsl' $'ls -l *(@[1,10])\n# only symlinks' - 'lsx' $'ls -l *(*[1,10])\n# only executables' - 'lsw' $'ls -ld *(R,W,X.^ND/)\n# world-{readable,writable,executable} files' - 'lsbig' $'ls -flh *(.OL[1,10])\n# display the biggest files' - 'lsd' $'ls -d *(/)\n# only show directories' - 'lse' $'ls -d *(/^F)\n# only show empty directories' - 'lsnew' $'ls -rl *(D.om[1,10])\n# display the newest files' - 'lsold' $'ls -rtlh *(D.om[-11,-1])\n # display the oldest files' - 'lssmall' $'ls -Srl *(.oL[1,10])\n# display the smallest files' - 'rw-' 'chmod 600' - '600' 'chmod u+rw-x,g-rwx,o-rwx' - 'rwx' 'chmod u+rwx' - '700' 'chmod u+rwx,g-rwx,o-rwx' - 'r--' 'chmod u+r-wx,g-rwx,o-rwx' - '644' $'chmod u+rw-x,g+r-wx,o+r-wx\n # 4=r,2=w,1=x' - '755' 'chmod u+rwx,g+r-w+x,o+r-w+x' - 'md' 'mkdir -p ' - 'cmplayer' 'mplayer -vo -fs -zoom fbdev' - 'fbmplayer' 'mplayer -vo -fs -zoom fbdev' - 'fblinks' 'links2 -driver fb' - 'insecssh' 'ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null"' - 'insecscp' 'scp -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null"' - 'fori' 'for i ({..}) { }' - 'cx' 'chmod +x' - 'e' 'print -l' - 'se' 'setopt interactivecomments' - 'va' 'valac --vapidir=../vapi/ --pkg=gtk+-2.0 gtktest.vala' - 'fb2' '=mplayer -vo fbdev -fs -zoom 1>/dev/null -xy 2' - 'fb3' '=mplayer -vo fbdev -fs -zoom 1>/dev/null -xy 3' - 'ci' 'centericq' - 'D' 'export DISPLAY=:0.0' - 'mp' 'mplayer -vo xv -fs -zoom' + 'co' './configure && make && sudo make install' ) globalias() { + emulate -L zsh + setopt extendedglob local MATCH if (( NOABBREVIATION > 0 )) ; then @@ -881,8 +941,8 @@ alias run-help >&/dev/null && unalias run-help zrcautoload run-help # use via 'esc-h' # completion system -if zrcautoload compinit && compinit 2>/dev/null ; then - compinit 2>/dev/null || print 'Notice: no compinit available :(' +if zrcautoload compinit ; then + compinit || print 'Notice: no compinit available :(' else print 'Notice: no compinit available :(' function zstyle { } @@ -981,56 +1041,6 @@ bindkey '^x1' jump_after_first_word # }}} -# {{{ set some important options -# Please update these tags, if you change the umask settings below. -#o# r_umask 002 -#o# r_umaskstr rwxrwxr-x -#o# umask 022 -#o# umaskstr rwxr-xr-x -(( EUID != 0 )) && umask 002 || umask 022 - -# history: -setopt append_history # append history list to the history file (important for multiple parallel zsh sessions!) -is4 && setopt SHARE_HISTORY # import new commands from the history file also in other zsh-session -setopt extended_history # save each command's beginning timestamp and the duration to the history file -is4 && setopt histignorealldups # If a new command line being added to the history - # list duplicates an older one, the older command is removed from the list -setopt histignorespace # remove command lines from the history list when - # the first character on the line is a space -setopt auto_cd # if a command is issued that can't be executed as a normal command, - # and the command is the name of a directory, perform the cd command to that directory -setopt extended_glob # in order to use #, ~ and ^ for filename generation - # grep word *~(*.gz|*.bz|*.bz2|*.zip|*.Z) -> - # -> searches for word not in compressed files - # don't forget to quote '^', '~' and '#'! -setopt longlistjobs # display PID when suspending processes as well -setopt notify # report the status of backgrounds jobs immediately -setopt hash_list_all # Whenever a command completion is attempted, make sure \ - # the entire command path is hashed first. -setopt completeinword # not just at the end -setopt nohup # and don't kill them, either -setopt auto_pushd # make cd push the old directory onto the directory stack. -setopt nonomatch # try to avoid the 'zsh: no matches found...' -setopt nobeep # avoid "beep"ing -setopt pushd_ignore_dups # don't push the same dir twice. - -MAILCHECK=30 # mailchecks -REPORTTIME=5 # report about cpu-/system-/user-time of command if running longer than 5 seconds -watch=(notme root) # watch for everyone but me and root - -# only slash should be considered as a word separator: -slash-backward-kill-word() { - local WORDCHARS="${WORDCHARS:s@/@}" - # zle backward-word - zle backward-kill-word -} -zle -N slash-backward-kill-word - -#k# Kill everything in a word up to its last \kbd{/} -bindkey '\ev' slash-backward-kill-word - -# }}} - # {{{ history ZSHDIR=$HOME/.zsh @@ -1063,6 +1073,95 @@ chpwd() { # }}} +# directory based profiles {{{ + +if is433 ; then + +CHPWD_PROFILE='default' +function chpwd_profiles() { + # Say you want certain settings to be active in certain directories. + # This is what you want. + # + # zstyle ':chpwd:profiles:/usr/src/grml(|/|/*)' profile grml + # zstyle ':chpwd:profiles:/usr/src/debian(|/|/*)' profile debian + # + # When that's done and you enter a directory that matches the pattern + # in the third part of the context, a function called chpwd_profile_grml, + # for example, is called (if it exists). + # + # If no pattern matches (read: no profile is detected) the profile is + # set to 'default', which means chpwd_profile_default is attempted to + # be called. + # + # A word about the context (the ':chpwd:profiles:*' stuff in the zstyle + # command) which is used: The third part in the context is matched against + # ${PWD}. That's why using a pattern such as /foo/bar(|/|/*) makes sense. + # Because that way the profile is detected for all these values of ${PWD}: + # /foo/bar + # /foo/bar/ + # /foo/bar/baz + # So, if you want to make double damn sure a profile works in /foo/bar + # and everywhere deeper in that tree, just use (|/|/*) and be happy. + # + # The name of the detected profile will be available in a variable called + # 'profile' in your functions. You don't need to do anything, it'll just + # be there. + # + # Then there is the parameter $CHPWD_PROFILE is set to the profile, that + # was is currently active. That way you can avoid running code for a + # profile that is already active, by running code such as the following + # at the start of your function: + # + # function chpwd_profile_grml() { + # [[ ${profile} == ${CHPWD_PROFILE} ]] && return 1 + # ... + # } + # + # The initial value for $CHPWD_PROFILE is 'default'. + # + # Version requirement: + # This feature requires zsh 4.3.3 or newer. + # If you use this feature and need to know whether it is active in your + # current shell, there are several ways to do that. Here are two simple + # ways: + # + # a) If knowing if the profiles feature is active when zsh starts is + # good enough for you, you can put the following snippet into your + # .zshrc.local: + # + # (( ${+functions[chpwd_profiles]} )) && print "directory profiles active" + # + # b) If that is not good enough, and you would prefer to be notified + # whenever a profile changes, you can solve that by making sure you + # start *every* profile function you create like this: + # + # function chpwd_profile_myprofilename() { + # [[ ${profile} == ${CHPWD_PROFILE} ]] && return 1 + # print "chpwd(): Switching to profile: $profile" + # ... + # } + # + # That makes sure you only get notified if a profile is *changed*, + # not everytime you change directory, which would probably piss + # you off fairly quickly. :-) + # + # There you go. Now have fun with that. + local -x profile + + zstyle -s ":chpwd:profiles:${PWD}" profile profile || profile='default' + if (( ${+functions[chpwd_profile_$profile]} )) ; then + chpwd_profile_${profile} + fi + + CHPWD_PROFILE="${profile}" + return 0 +} +chpwd_functions=( ${chpwd_functions} chpwd_profiles ) + +fi # is433 + +# }}} + # {{{ display battery status on right side of prompt via running 'BATTERY=1 zsh' if [[ $BATTERY -gt 0 ]] ; then if ! check_com -c acpi ; then @@ -1072,7 +1171,7 @@ fi battery() { if [[ $BATTERY -gt 0 ]] ; then - PERCENT="${${"$(acpi 2>/dev/null)"}/(#b)[[:space:]]##Battery <->: [^0-9]##, (<->)%*/${match[1]}}" + PERCENT="${${"$(acpi 2>/dev/null)"}/(#b)[[:space:]]#Battery <->: [^0-9]##, (<->)%*/${match[1]}}" if [[ -z "$PERCENT" ]] ; then PERCENT='acpi not present' else @@ -1126,8 +1225,8 @@ fi # from , # which distributed under the same terms as zsh itself. -# we will only be using one variable, so let the code know now. -zstyle ':vcs_info:*' max-exports 1 +# we will be using two variables, so let the code know now. +zstyle ':vcs_info:*' max-exports 2 # vcs_info() documentation: #{{{ @@ -1415,17 +1514,21 @@ VCS_INFO_formats () { # {{{ (( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b]-' fi - (( ${#msgs} > maxexports )) && msgs[${maxexports},-1]=() + (( ${#msgs} > maxexports )) && msgs[$(( maxexports + 1 )),-1]=() for i in {1..${#msgs}} ; do - zformat -f msg ${msgs[$i]} a:${action} b:${branch} s:${vcs} r:${base:t} R:${base} S:"$(VCS_INFO_reposub ${base})" + zformat -f msg ${msgs[$i]} \ + a:${action} \ + b:${branch} \ + r:${base:t} \ + s:${vcs} \ + R:${base} \ + S:"$(VCS_INFO_reposub ${base})" msgs[$i]=${msg} done return 0 } # }}} VCS_INFO_maxexports () { #{{{ - local -ix maxexports - zstyle -s ":vcs_info:${vcs}:${usercontext}" "max-exports" maxexports || maxexports=2 if [[ ${maxexports} != <-> ]] || (( maxexports < 1 )); then printf 'vcs_info(): expecting numeric arg >= 1 for max-exports (got %s).\n' ${maxexports} @@ -1655,10 +1758,17 @@ VCS_INFO_git_get_data () { # {{{ } # }}} VCS_INFO_hg_get_data () { # {{{ - local hgbranch hgbase + local hgbranch hgbase file hgbase=${vcs_comm[basedir]} - hgbranch=$(< ${hgbase}/.hg/branch) + + file="${hgbase}/.hg/branch" + if [[ -r ${file} ]] ; then + hgbranch=$(< ${file}) + else + hgbranch='default' + fi + VCS_INFO_formats '' "${hgbranch}" "${hgbase}" return 0 } @@ -1719,7 +1829,7 @@ VCS_INFO_detect_by_dir() { #{{{ while [[ ${realbasedir} != '/' ]]; do if [[ -n ${vcs_comm[detect_need_file]} ]] ; then [[ -d ${basedir}/${dirname} ]] && \ - [[ -f ${basedir}/${dirname}/${vcs_comm[detect_need_file]} ]] && \ + [[ -e ${basedir}/${dirname}/${vcs_comm[detect_need_file]} ]] && \ break else [[ -d ${basedir}/${dirname} ]] && break @@ -1773,7 +1883,7 @@ VCS_INFO_git_detect() { #{{{ # }}} VCS_INFO_hg_detect() { #{{{ VCS_INFO_check_com hg || return 1 - vcs_comm[detect_need_file]=branch + vcs_comm[detect_need_file]=store VCS_INFO_detect_by_dir '.hg' return $? } @@ -1857,6 +1967,7 @@ vcs_info () { # {{{ local -i found local -a VCSs disabled dps local -x vcs usercontext + local -ix maxexports local -ax msgs local -Ax vcs_comm @@ -1923,19 +2034,38 @@ vcs_info () { # {{{ VCS_INFO_set --nvcs preinit # }}} -# change vcs_info formats for the grml prompt +# Change vcs_info formats for the grml prompt. The 2nd format sets up +# $vcs_info_msg_1_ to contain "zsh: repo-name" used to set our screen title. +# TODO: The included vcs_info() version still uses $VCS_INFO_message_N_. +# That needs to be the use of $VCS_INFO_message_N_ needs to be changed +# to $vcs_info_msg_N_ as soon as we use the included version. if [[ "$TERM" == dumb ]] ; then - zstyle ':vcs_info:*' actionformats "(%s%)-[%b|%a] " - zstyle ':vcs_info:*' formats "(%s%)-[%b] " + zstyle ':vcs_info:*' actionformats "(%s%)-[%b|%a] " "zsh: %r" + zstyle ':vcs_info:*' formats "(%s%)-[%b] " "zsh: %r" else # these are the same, just with a lot of colours: - zstyle ':vcs_info:*' actionformats "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${YELLOW}|${RED}%a${MAGENTA}]${NO_COLOUR} " - zstyle ':vcs_info:*' formats "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${MAGENTA}]${NO_COLOUR}%} " + zstyle ':vcs_info:*' actionformats "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${YELLOW}|${RED}%a${MAGENTA}]${NO_COLOUR} " \ + "zsh: %r" + zstyle ':vcs_info:*' formats "${MAGENTA}(${NO_COLOUR}%s${MAGENTA})${YELLOW}-${MAGENTA}[${GREEN}%b${MAGENTA}]${NO_COLOUR}%} " \ + "zsh: %r" zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat "%b${RED}:${YELLOW}%r" fi # }}} +# command not found handling {{{ + +(( ${COMMAND_NOT_FOUND} == 1 )) && +function command_not_found_handler() { + emulate -L zsh + if [[ -x ${GRML_ZSH_CNF_HANDLER} ]] ; then + ${GRML_ZSH_CNF_HANDLER} $1 + fi + return 1 +} + +# }}} + # {{{ set prompt if zrcautoload promptinit && promptinit 2>/dev/null ; then promptinit # people should be able to use their favourite prompt @@ -1948,32 +2078,35 @@ setopt prompt_subst # make sure to use right prompt only when not running a command is41 && setopt transient_rprompt +# TODO: revise all these NO* variables and especially their documentation +# in zsh-help() below. is4 && [[ $NOPRECMD -eq 0 ]] && precmd () { [[ $NOPRECMD -gt 0 ]] && return 0 # update VCS information vcs_info - # allow manual overwriting of RPROMPT - if [[ -n $RPROMPT ]] ; then - [[ $TERM == screen* ]] && print -nP "\ekzsh\e\\" - # return 0 + if [[ $TERM == screen* ]] ; then + if [[ -n ${VCS_INFO_message_1_} ]] ; then + print -nP "\ek${VCS_INFO_message_1_}\e\\" + else + print -nP "\ekzsh\e\\" + fi fi # just use DONTSETRPROMPT=1 to be able to overwrite RPROMPT if [[ $DONTSETRPROMPT -eq 0 ]] ; then if [[ $BATTERY -gt 0 ]] ; then - # update BATTERY information + # update battery (dropped into $PERCENT) information battery - RPROMPT="%(?..:()% ${PERCENT}${SCREENTITLE}" - # RPROMPT="${PERCENT}${SCREENTITLE}" + RPROMPT="%(?..:() ${PERCENT}" else - RPROMPT="%(?..:()% ${SCREENTITLE}" - # RPROMPT="${SCREENTITLE}" + RPROMPT="%(?..:() " fi fi # adjust title of xterm # see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html + [[ ${NOTITLE} -gt 0 ]] && return 0 case $TERM in - (xterm*|rxvt) + (xterm*|rxvt*) print -Pn "\e]0;%n@%m: %~\a" ;; esac @@ -1994,15 +2127,10 @@ preexec () { local CMD="${1[(wr)^(*=*|sudo|ssh|-*)]}$NAME" # use hostname echo -ne "\ek$CMD\e\\" fi -# set the screen title to "zsh" when sitting at the command prompt: - if [[ "$TERM" == screen* ]] ; then - SCREENTITLE=$'%{\ekzsh\e\\%}' - else - SCREENTITLE='' - fi # adjust title of xterm + [[ ${NOTITLE} -gt 0 ]] && return 0 case $TERM in - (xterm*|rxvt) + (xterm*|rxvt*) print -Pn "\e]0;%n@%m: $1\a" ;; esac @@ -2111,8 +2239,7 @@ alias term2iso="echo 'Setting terminal to iso mode' ; print -n '\e%@'" alias term2utf="echo 'Setting terminal to utf-8 mode'; print -n '\e%G'" # make sure it is not assigned yet -[[ $(whence -w utf2iso &>/dev/null) == 'utf2iso: alias' ]] && unalias utf2iso - +[[ -n ${aliases[utf2iso]} ]] && unalias utf2iso utf2iso() { if isutfenv ; then for ENV in $(env | command grep -i '.utf') ; do @@ -2122,7 +2249,7 @@ utf2iso() { } # make sure it is not assigned yet -[[ $(whence -w iso2utf &>/dev/null) == 'iso2utf: alias' ]] && unalias iso2utf +[[ -n ${aliases[iso2utf]} ]] && unalias iso2utf iso2utf() { if ! isutfenv ; then for ENV in $(env | command grep -i '\.iso') ; do @@ -2223,7 +2350,14 @@ the zsh yet. :) "NOCOR=1 zsh" => deactivate automatic correction "NOMENU=1 zsh" => do not use auto menu completion (note: use ctrl-d for completion instead!) "NOPRECMD=1 zsh" => disable the precmd + preexec commands (set GNU screen title) + "NOTITLE=1 zsh" => disable setting the title of xterms without disabling + preexec() and precmd() completely "BATTERY=1 zsh" => activate battery status (via acpi) on right side of prompt + "COMMAND_NOT_FOUND=1 zsh" + => Enable a handler if an external command was not found + The command called in the handler can be altered by setting + the GRML_ZSH_CNF_HANDLER variable, the default is: + "/usr/share/command-not-found/command-not-found" A value greater than 0 is enables a feature; a value equal to zero disables it. If you like one or the other of these settings, you can @@ -2264,7 +2398,8 @@ if [[ -r /etc/debian_version ]] ; then # debian upgrade #f3# Execute \kbd{apt-get update \&\& }\\&\quad \kbd{apt-get dist-upgrade} upgrade() { - if [[ -z "$1" ]] ; then + emulate -L zsh + if [[ -z $1 ]] ; then $SUDO apt-get update $SUDO apt-get -u upgrade else @@ -2286,9 +2421,9 @@ if [[ -r /etc/debian_version ]] ; then fi #a1# Take a look at the syslog: \kbd{\$PAGER /var/log/syslog} - alias llog="$PAGER /var/log/syslog" # take a look at the syslog + salias llog="$PAGER /var/log/syslog" # take a look at the syslog #a1# Take a look at the syslog: \kbd{tail -f /var/log/syslog} - alias tlog="tail -f /var/log/syslog" # follow the syslog + salias tlog="tail -f /var/log/syslog" # follow the syslog fi # sort installed Debian-packages by size @@ -2494,7 +2629,10 @@ grmlcomp() { # use generic completion system for programs not yet defined; (_gnu_generic works # with commands that provide a --help option with "standard" gnu-like output.) - compdef _gnu_generic tail head feh cp mv df stow uname ipacsum fetchipac + for compcom in cp deborphan df feh fetchipac head hnb ipacsum mv \ + pal stow tail uname ; do + [[ -z ${_comps[$compcom]} ]] && compdef _gnu_generic ${compcom} + done; unset compcom # see upgrade function in this file compdef _hosts upgrade @@ -2577,6 +2715,9 @@ setenv() { typeset -x "${1}${1:+=}${(@)argv[2,$#]}" } # csh compatibility #f1# Reload an autoloadable function freload() { while (( $# )); do; unfunction $1; autoload -U $1; shift; done } +# TODO: Who really uses reload()? The proper way to reload a zsh setup is to +# actually restart the shell via 'exec zsh'. And reload with arguments is the +# same as freload() above. -ft #f1# Reload zsh setup reload() { if [[ "$#*" -eq 0 ]] ; then @@ -2594,8 +2735,7 @@ compdef _functions reload freload #f1# List symlinks in detail (more detailed version of 'readlink -f' and 'whence -s') sll() { [[ -z "$1" ]] && printf 'Usage: %s \n' "$0" && return 1 - for i in "$@" ; do - file=$i + for file in "$@" ; do while [[ -h "$file" ]] ; do ls -l $file file=$(readlink "$file") @@ -2612,20 +2752,24 @@ else manzsh() { /usr/bin/man zshall | vim -c "se ft=man| se hlsearch" +/"$1" - ; } fi +# TODO: Is it supported to use pager settings like this? +# PAGER='less -Mr' - If so, the use of $PAGER here needs fixing +# with respect to wordsplitting. (ie. ${=PAGER}) if check_com -c $PAGER ; then #f1# View Debian's changelog of a given package dchange() { - if [[ -r /usr/share/doc/${1}/changelog.Debian.gz ]] ; then - $PAGER /usr/share/doc/${1}/changelog.Debian.gz - elif [[ -r /usr/share/doc/${1}/changelog.gz ]] ; then - $PAGER /usr/share/doc/${1}/changelog.gz + emulate -L zsh + if [[ -r /usr/share/doc/$1/changelog.Debian.gz ]] ; then + $PAGER /usr/share/doc/$1/changelog.Debian.gz + elif [[ -r /usr/share/doc/$1/changelog.gz ]] ; then + $PAGER /usr/share/doc/$1/changelog.gz else if check_com -c aptitude ; then echo "No changelog for package $1 found, using aptitude to retrieve it." if isgrml ; then - aptitude -t unstable changelog ${1} + aptitude -t unstable changelog $1 else - aptitude changelog ${1} + aptitude changelog $1 fi else echo "No changelog for package $1 found, sorry." @@ -2638,11 +2782,12 @@ if check_com -c $PAGER ; then #f1# View Debian's NEWS of a given package dnews() { - if [[ -r /usr/share/doc/${1}/NEWS.Debian.gz ]] ; then - $PAGER /usr/share/doc/${1}/NEWS.Debian.gz + emulate -L zsh + if [[ -r /usr/share/doc/$1/NEWS.Debian.gz ]] ; then + $PAGER /usr/share/doc/$1/NEWS.Debian.gz else - if [[ -r /usr/share/doc/${1}/NEWS.gz ]] ; then - $PAGER /usr/share/doc/${1}/NEWS.gz + if [[ -r /usr/share/doc/$1/NEWS.gz ]] ; then + $PAGER /usr/share/doc/$1/NEWS.gz else echo "No NEWS file for package $1 found, sorry." return 1 @@ -2654,8 +2799,9 @@ if check_com -c $PAGER ; then #f1# View upstream's changelog of a given package uchange() { - if [[ -r /usr/share/doc/${1}/changelog.gz ]] ; then - $PAGER /usr/share/doc/${1}/changelog.gz + emulate -L zsh + if [[ -r /usr/share/doc/$1/changelog.gz ]] ; then + $PAGER /usr/share/doc/$1/changelog.gz else echo "No changelog for package $1 found, sorry." return 1 @@ -2763,6 +2909,7 @@ check_com -c qma && alias ?='qma zshall' # grep for running process, like: 'any vim' any() { + emulate -L zsh if [[ -z "$1" ]] ; then echo "any - grep for process(es) by keyword" >&2 echo "Usage: any " >&2 ; return 1 @@ -2786,6 +2933,7 @@ deswap() { # print hex value of a number hex() { + emulate -L zsh [[ -n "$1" ]] && printf "%x\n" $1 || { print 'Usage: hex ' ; return 1 } } @@ -2827,6 +2975,7 @@ uiae() { # set up an ipv6 tunnel ipv6-tunnel() { + emulate -L zsh case $1 in start) if ifconfig sit1 2>/dev/null | grep -q 'inet6 addr: 2002:.*:1::1' ; then @@ -2875,6 +3024,17 @@ minimal-shell() { exec env -i ENV="/etc/minimal-shellrc" HOME="$HOME" TERM="$TERM" ksh } +# a wrapper for vim, that deals with title setting +# VIM_OPTIONS +# set this array to a set of options to vim you always want +# to have set when calling vim (in .zshrc.local), like: +# VIM_OPTIONS=( -p ) +# This will cause vim to send every file given on the +# commandline to be send to it's own tab (needs vim7). +vim() { + VIM_PLEASE_SET_TITLE='yes' command vim ${VIM_OPTIONS} "$@" +} + # make a backup of a file bk() { cp -a "$1" "${1}_$(date --iso-8601=seconds)" @@ -2943,10 +3103,6 @@ exit 0; for color in BLUE RED GREEN CYAN YELLOW MAGENTA WHITE ; unset $color # }}} -# source another config file if present {{{ -xsource "/etc/zsh/zshrc.local" -# }}} - # "persistent history" {{{ # just write important commands you always need to ~/.important_commands if [[ -r ~/.important_commands ]] ; then @@ -2958,7 +3114,11 @@ fi ### non-root (EUID != 0) code below ### -(( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) && return 0 +if (( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) ; then + zrclocal + return 0 +fi + # variables {{{ @@ -3011,11 +3171,6 @@ alias CO="./configure" #a2# Execute \kbd{./configure --help} alias CH="./configure --help" -# http://conkeror.mozdev.org/ -# TODO: I think this should be removed, as conkeror is not a simple extension anymore -#a2# Run a keyboard driven firefox -alias conkeror='firefox -chrome chrome://conkeror/content' - # arch/tla stuff if check_com -c tla ; then #a2# Execute \kbd{tla what-changed --diffs | less} @@ -3092,11 +3247,6 @@ check_com -c python && alias http="python -m SimpleHTTPServer" # Use 'g' instead of 'git': check_com g || alias g='git' -# use colors when browsing man pages, but only if not using LESS_TERMCAP_* from /etc/zsh/zshenv: -if [[ -z "$LESS_TERMCAP_md" ]] ; then - [[ -d ~/.terminfo/ ]] && alias man='TERMINFO=~/.terminfo/ LESS=C TERM=mostlike PAGER=less man' -fi - # check whether Debian's package management (dpkg) is running if check_com salias ; then #a2# Check whether a dpkg instance is currently running @@ -3129,7 +3279,8 @@ fi agoogle() { ${=BROWSER} "http://groups.google.com/groups?as_uauthors=$*" ; } #f4# Search Debian Bug Tracking System debbug() { - setopt localoptions extendedglob + emulate -L zsh + setopt extendedglob if [[ $# -eq 1 ]]; then case "$1" in ([0-9]##) @@ -3148,79 +3299,177 @@ debbug() { fi } #f4# Search Debian Bug Tracking System in mbox format -debbugm() { bts show --mbox $1 } # provide bugnummer as "$1" +debbugm() { + emulate -L zsh + bts show --mbox $1 +} #f4# Search DMOZ -dmoz() { ${=BROWSER} http://search.dmoz.org/cgi-bin/search\?search=${1// /_} } +dmoz() { + emulate -L zsh + ${=BROWSER} http://search.dmoz.org/cgi-bin/search\?search=${1// /_} +} #f4# Search German Wiktionary -dwicti() { ${=BROWSER} http://de.wiktionary.org/wiki/${(C)1// /_} } +dwicti() { + emulate -L zsh + ${=BROWSER} http://de.wiktionary.org/wiki/${(C)1// /_} +} #f4# Search English Wiktionary -ewicti() { ${=BROWSER} http://en.wiktionary.org/wiki/${(C)1// /_} } +ewicti() { + emulate -L zsh + ${=BROWSER} http://en.wiktionary.org/wiki/${(C)1// /_} +} #f4# Search Google Groups -ggogle() { ${=BROWSER} "http://groups.google.com/groups?q=$*" } +ggogle() { + emulate -L zsh + ${=BROWSER} "http://groups.google.com/groups?q=$*" +} #f4# Search Google -google() { ${=BROWSER} "http://www.google.com/search?&num=100&q=$*" } +google() { + emulate -L zsh + ${=BROWSER} "http://www.google.com/search?&num=100&q=$*" +} #f4# Search Google Groups for MsgID -mggogle() { ${=BROWSER} "http://groups.google.com/groups?selm=$*" } +mggogle() { + emulate -L zsh + ${=BROWSER} "http://groups.google.com/groups?selm=$*" +} #f4# Search Netcraft -netcraft(){ ${=BROWSER} "http://toolbar.netcraft.com/site_report?url=$1" } +netcraft(){ + emulate -L zsh + ${=BROWSER} "http://toolbar.netcraft.com/site_report?url=$1" +} #f4# Use German Wikipedia's full text search -swiki() { ${=BROWSER} http://de.wikipedia.org/wiki/Spezial:Search/${(C)1} } +swiki() { + emulate -L zsh + ${=BROWSER} http://de.wikipedia.org/wiki/Spezial:Search/${(C)1} +} #f4# search \kbd{dict.leo.org} -oleo() { ${=BROWSER} "http://dict.leo.org/?search=$*" } +oleo() { + emulate -L zsh + ${=BROWSER} "http://dict.leo.org/?search=$*" +} #f4# Search German Wikipedia -wikide() { ${=BROWSER} http://de.wikipedia.org/wiki/"${(C)*}" } +wikide() { + emulate -L zsh + ${=BROWSER} http://de.wikipedia.org/wiki/"${(C)*}" +} #f4# Search English Wikipedia -wikien() { ${=BROWSER} http://en.wikipedia.org/wiki/"${(C)*}" } +wikien() { + emulate -L zsh + ${=BROWSER} http://en.wikipedia.org/wiki/"${(C)*}" +} #f4# Search official debs -wodeb() { ${=BROWSER} "http://packages.debian.org/search?keywords=$1&searchon=contents&suite=${2:=unstable}§ion=all" } +wodeb() { + emulate -L zsh + ${=BROWSER} "http://packages.debian.org/search?keywords=$1&searchon=contents&suite=${2:=unstable}§ion=all" +} #m# f4 gex() Exact search via Google -check_com google && gex () { google "\"[ $1]\" $*" } # exact search at google +check_com google && gex () { + google "\"[ $1]\" $*" +} # misc #f5# Backup \kbd{file {\rm to} file\_timestamp} -bk() { cp -b ${1} ${1}_`date --iso-8601=m` } +bk() { + emulate -L zsh + cp -b $1 $1_`date --iso-8601=m` +} #f5# Copied diff -cdiff() { diff -crd "$*" | egrep -v "^Only in |^Binary files " } +cdiff() { + emulate -L zsh + diff -crd "$*" | egrep -v "^Only in |^Binary files " +} #f5# cd to directoy and list files -cl() { cd $1 && ls -a } # cd && ls +cl() { + emulate -L zsh + cd $1 && ls -a +} #f5# Cvs add -cvsa() { cvs add $* && cvs com -m 'initial checkin' $* } +cvsa() { + emulate -L zsh + cvs add $* && cvs com -m 'initial checkin' $* +} #f5# Cvs diff -cvsd() { cvs diff -N $* |& $PAGER } +cvsd() { + emulate -L zsh + cvs diff -N $* |& $PAGER +} #f5# Cvs log -cvsl() { cvs log $* |& $PAGER } +cvsl() { + emulate -L zsh + cvs log $* |& $PAGER +} #f5# Cvs update -cvsq() { cvs -nq update } +cvsq() { + emulate -L zsh + cvs -nq update +} #f5# Rcs2log -cvsr() { rcs2log $* | $PAGER } +cvsr() { + emulate -L zsh + rcs2log $* | $PAGER +} #f5# Cvs status -cvss() { cvs status -v $* } +cvss() { + emulate -L zsh + cvs status -v $* +} #f5# Disassemble source files using gcc and as -disassemble(){ gcc -pipe -S -o - -O -g $* | as -aldh -o /dev/null } +disassemble(){ + emulate -L zsh + gcc -pipe -S -o - -O -g $* | as -aldh -o /dev/null +} #f5# Firefox remote control - open given URL -fir() { firefox -a firefox -remote "openURL($1)" } +fir() { + firefox -a firefox -remote "openURL($1)" +} #f5# Create Directoy and \kbd{cd} to it -mcd() { mkdir -p "$@"; cd "$@" } # mkdir && cd +mcd() { + mkdir -p "$@" && cd "$@" +} #f5# Unified diff to timestamped outputfile -mdiff() { diff -udrP "$1" "$2" > diff.`date "+%Y-%m-%d"`."$1" } +mdiff() { + diff -udrP "$1" "$2" > diff.`date "+%Y-%m-%d"`."$1" +} #f5# Memory overview -memusage(){ ps aux | awk '{if (NR > 1) print $5; if (NR > 2) print "+"} END { print "p" }' | dc } +memusage() { + ps aux | awk '{if (NR > 1) print $5; if (NR > 2) print "+"} END { print "p" }' | dc +} #f5# Show contents of tar file -shtar() { gunzip -c $1 | tar -tf - -- | $PAGER } +shtar() { + emulate -L zsh + gunzip -c $1 | tar -tf - -- | $PAGER +} #f5# Show contents of tgz file -shtgz() { tar -ztf $1 | $PAGER } +shtgz() { + emulate -L zsh + tar -ztf $1 | $PAGER +} #f5# Show contents of zip file -shzip() { unzip -l $1 | $PAGER } +shzip() { + emulate -L zsh + unzip -l $1 | $PAGER +} #f5# Greps signature from file -sig() { agrep -d '^-- $' "$*" ~/.Signature } +sig() { + emulate -L zsh + agrep -d '^-- $' "$*" ~/.Signature +} #f5# Unified diff -udiff() { diff -urd $* | egrep -v "^Only in |^Binary files " } +udiff() { + emulate -L zsh + diff -urd $* | egrep -v "^Only in |^Binary files " +} #f5# (Mis)use \kbd{vim} as \kbd{less} -viless() { vim --cmd 'let no_plugin_maps = 1' -c "so \$VIMRUNTIME/macros/less.vim" "${@:--}" } +viless() { + emulate -L zsh + vim --cmd 'let no_plugin_maps = 1' -c "so \$VIMRUNTIME/macros/less.vim" "${@:--}" +} # download video from youtube ytdl() { + emulate -L zsh if ! [[ -n "$2" ]] ; then print "Usage: ydtl http://youtube.com/watch?v=.... outputfile.flv">&2 return 1 @@ -3232,6 +3481,7 @@ ytdl() { # Function Usage: uopen $URL/$file #f5# Download a file and display it locally uopen() { + emulate -L zsh if ! [[ -n "$1" ]] ; then print "Usage: uopen \$URL/\$file">&2 return 1 @@ -3245,7 +3495,10 @@ uopen() { # Function Usage: doc packagename #f5# \kbd{cd} to /usr/share/doc/\textit{package} -doc() { cd /usr/share/doc/$1 && ls } +doc() { + emulate -L zsh + cd /usr/share/doc/$1 && ls +} _doc() { _files -W /usr/share/doc -/ } check_com compdef && compdef _doc doc @@ -3270,6 +3523,7 @@ limg() { #f5# Create PDF file from source code makereadable() { + emulate -L zsh output=$1 shift a2ps --medium A4dj -E -o $output $* @@ -3280,27 +3534,31 @@ makereadable() { # regcheck '\s\d\.\d{3}\.\d{3} Euro' ' 1.000.000 Euro' #f5# Checks whether a regex matches or not.\\&\quad Example: \kbd{regcheck '.\{3\} EUR' '500 EUR'} regcheck() { + emulate -L zsh zmodload -i zsh/pcre pcre_compile $1 && \ pcre_match $2 && echo "regex matches" || echo "regex does not match" } #f5# List files which have been modified within the last {\it n} days -new() { print -l *(m-$1) } +new() { + emulate -L zsh + print -l *(m-$1) +} #f5# Grep in history -greph() { history 0 | grep $1 } +greph() { + emulate -L zsh + history 0 | grep $1 +} # use colors when GNU grep with color-support #a2# Execute \kbd{grep -{}-color=auto} (grep --help 2>/dev/null |grep -- --color) >/dev/null && alias grep='grep --color=auto' #a2# Execute \kbd{grep -i -{}-color=auto} alias GREP='grep -i --color=auto' -# one blank line between each line -if [[ -r ~/.terminfo/m/mostlike ]] ; then - #f5# Watch manpages in a stretched style - man2() { PAGER='dash -c "sed G | /usr/bin/less"' TERM=mostlike /usr/bin/man "$@" ; } -fi +#f5# Watch manpages in a stretched style +man2() { PAGER='dash -c "sed G | /usr/bin/less"' command man "$@" ; } # d():Copyright 2005 Nikolai Weibull # note: option AUTO_PUSHD has to be set @@ -3364,6 +3622,7 @@ purge() { # /usr/local/lib/words/en-de.ISO-8859-1.vok > ~/.translate/de-en.ISO-8859-1.vok #f5# Translates a word trans() { + emulate -L zsh case "$1" in -[dD]*) translate -l de-en $2 @@ -3380,6 +3639,7 @@ trans() { #f5# List all occurrences of programm in current PATH plap() { + emulate -L zsh if [[ $# = 0 ]] ; then echo "Usage: $0 program" echo "Example: $0 zsh" @@ -3408,11 +3668,15 @@ selhist() { # Use vim to convert plaintext to HTML #f5# Transform files to html with highlighting -2html() { vim -u NONE -n -c ':syntax on' -c ':so $VIMRUNTIME/syntax/2html.vim' -c ':wqa' $1 &>/dev/null } +2html() { + emulate -L zsh + vim -u NONE -n -c ':syntax on' -c ':so $VIMRUNTIME/syntax/2html.vim' -c ':wqa' $1 &>/dev/null +} # Usage: simple-extract #f5# Smart archive extractor simple-extract () { + emulate -L zsh if [[ -f $1 ]] ; then case $1 in *.tar.bz2) bzip2 -v -d $1 ;; @@ -3437,6 +3701,7 @@ simple-extract () { # Usage: smartcompress () #f5# Smart archive creator smartcompress() { + emulate -L zsh if [[ -n $2 ]] ; then case $2 in tgz | tar.gz) tar -zcvf$1.$2 $1 ;; @@ -3457,6 +3722,7 @@ smartcompress() { # Usage: show-archive #f5# List an archive's content show-archive() { + emulate -L zsh if [[ -f $1 ]] ; then case $1 in *.tar.gz) gunzip -c $1 | tar -tf - -- ;; @@ -3474,11 +3740,15 @@ show-archive() { # It's shameless stolen from #f5# Use \kbd{vim} as your manpage reader -vman() { man $* | col -b | view -c 'set ft=man nomod nolist' - } +vman() { + emulate -L zsh + man $* | col -b | view -c 'set ft=man nomod nolist' - +} # function readme() { $PAGER -- (#ia3)readme* } #f5# View all README-like files in current directory in pager readme() { + emulate -L zsh local files files=(./(#i)*(read*me|lue*m(in|)ut)*(ND)) if (($#files)) ; then @@ -3518,6 +3788,7 @@ findsuid() { print 'Finished' } +# TODO: So, this is the third incarnation of this function!? #f5# Reload given functions refunc() { for func in $argv ; do @@ -3530,8 +3801,9 @@ refunc() { # stolen and modified from Sven's zshrc.forall #f5# Report diskusage of a directory dirspace() { + emulate -L zsh if [[ -n "$1" ]] ; then - for dir in $* ; do + for dir in "$@" ; do if [[ -d "$dir" ]] ; then ( cd $dir; echo "-<$dir>"; du -shx .; echo); else @@ -3552,7 +3824,7 @@ dirspace() { # % slow_print `cat /etc/passwd` #f5# Slowly print out parameters slow_print() { - for argument in "${@}" ; do + for argument in "$@" ; do for ((i = 1; i <= ${#1} ;i++)) ; do print -n "${argument[i]}" sleep 0.08 @@ -3564,14 +3836,14 @@ slow_print() { #f5# Show some status info status() { - print "" - print "Date..: "$(date "+%Y-%m-%d %H:%M:%S")"" + print + print "Date..: "$(date "+%Y-%m-%d %H:%M:%S") print "Shell.: Zsh $ZSH_VERSION (PID = $$, $SHLVL nests)" - print "Term..: $TTY ($TERM), ${BAUD:+$BAUD bauds, }$COLUMNS x $LINES cars" + print "Term..: $TTY ($TERM), ${BAUD:+$BAUD bauds, }$COLUMNS x $LINES chars" print "Login.: $LOGNAME (UID = $EUID) on $HOST" print "System: $(cat /etc/[A-Za-z]*[_-][rv]e[lr]*)" print "Uptime:$(uptime)" - print "" + print } # Rip an audio CD @@ -3612,6 +3884,7 @@ audioburn() { #f5# Make an audio CD from all mp3 files mkaudiocd() { # TODO: do the renaming more zshish, possibly with zmv() + emulate -L zsh cd ~/ripps for i in *.[Mm][Pp]3; do mv "$i" `echo $i | tr '[A-Z]' '[a-z]'`; done for i in *.mp3; do mv "$i" `echo $i | tr ' ' '_'`; done @@ -3622,6 +3895,7 @@ mkaudiocd() { #f5# Create an ISO image. You are prompted for\\&\quad volume name, filename and directory mkiso() { + emulate -L zsh echo " * Volume name " read volume echo " * ISO Name (ie. tmp.iso)" @@ -3662,19 +3936,21 @@ allulimit() { # ogg2mp3 with bitrate of 192 ogg2mp3_192() { - oggdec -o - ${1} | lame -b 192 - ${1:r}.mp3 + emulate -L zsh + oggdec -o - $1 | lame -b 192 - ${1:r}.mp3 } #f5# RFC 2396 URL encoding in Z-Shell urlencode() { - setopt localoptions extendedglob + emulate -L zsh + setopt extendedglob input=( ${(s::)1} ) print ${(j::)input/(#b)([^A-Za-z0-9_.!~*\'\(\)-])/%${(l:2::0:)$(([##16]#match))}} } #f5# Install x-lite (VoIP software) getxlite() { - setopt local_options + emulate -L zsh setopt errreturn [[ -d ~/tmp ]] || mkdir ~/tmp cd ~/tmp @@ -3693,7 +3969,7 @@ getxlite() { #f5# Install skype getskype() { - setopt local_options + emulate -L zsh setopt errreturn echo "Downloading debian package of skype." echo "Notice: If you want to use a more recent skype version run 'getskypebeta'." @@ -3703,7 +3979,7 @@ getskype() { #f5# Install beta-version of skype getskypebeta() { - setopt local_options + emulate -L zsh setopt errreturn echo "Downloading debian package of skype (beta version)." wget http://www.skype.com/go/getskype-linux-beta-deb @@ -3712,7 +3988,7 @@ getskypebeta() { #f5# Install gizmo (VoIP software) getgizmo() { - setopt local_options + emulate -L zsh setopt errreturn echo "libgtk2.0-0, gconf2, libstdc++6, libasound2 and zlib1g have to be available. Installing." $SUDO apt-get update @@ -3723,7 +3999,7 @@ getgizmo() { #f5# Get and run AIR (Automated Image and Restore) getair() { - setopt local_options + emulate -L zsh setopt errreturn [[ -w . ]] || { echo 'Error: you do not have write permissions in this directory. Exiting.' ; return 1 } local VER='1.2.8' @@ -3736,6 +4012,7 @@ getair() { #f5# Get specific git commitdiff git-get-diff() { + emulate -L zsh if [[ -z $GITTREE ]] ; then GITTREE='linux/kernel/git/torvalds/linux-2.6.git' fi @@ -3748,6 +4025,7 @@ git-get-diff() { #f5# Get specific git commit git-get-commit() { + emulate -L zsh if [[ -z $GITTREE ]] ; then GITTREE='linux/kernel/git/torvalds/linux-2.6.git' fi @@ -3760,6 +4038,7 @@ git-get-commit() { #f5# Get specific git diff git-get-plaindiff () { + emulate -L zsh if [[ -z $GITTREE ]] ; then GITTREE='linux/kernel/git/torvalds/linux-2.6.git' fi @@ -3778,13 +4057,14 @@ git-get-plaindiff () { # http://strcat.de/blog/index.php?/archives/335-Software-sauber-deinstallieren...html #f5# Log 'make install' output mmake() { + emulate -L zsh [[ ! -d ~/.errorlogs ]] && mkdir ~/.errorlogs make -n install > ~/.errorlogs/${PWD##*/}-makelog } #f5# Indent source code smart-indent() { - indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs $* + indent -npro -kr -i8 -ts8 -sob -l80 -ss -ncs "$@" } # highlight important stuff in diff output, usage example: hg diff | hidiff @@ -3795,6 +4075,7 @@ check_com -c histring && \ # rename pictures based on information found in exif headers #f5# Rename pictures based on information found in exif headers exirename() { + emulate -L zsh if [[ $# -lt 1 ]] ; then echo 'Usage: jpgrename $FILES' >& 2 return 1 @@ -3813,6 +4094,7 @@ exirename() { # open file in vim and jump to line # http://www.downgra.de/archives/2007/05/08/T19_21_11/ j2v() { + emulate -L zsh local -a params params=(${*//(#m):[0-9]*:/\\n+${MATCH//:/}}) # replace ':23:' to '\n+23' params=(${(s|\n|)${(j|\n|)params}}) # join array using '\n', then split on all '\n' @@ -3821,6 +4103,7 @@ j2v() { # get_ic() - queries imap servers for capabilities; real simple. no imaps ic_get() { + emulate -L zsh local port if [[ ! -z $1 ]] ; then port=${2:-143} @@ -3833,6 +4116,7 @@ ic_get() { # creates a Maildir/ with its {new,cur,tmp} subdirs mkmaildir() { + emulate -L zsh local root subdir root=${MAILDIR_ROOT:-${HOME}/Mail} if [[ -z ${1} ]] ; then print "Usage:\n $0 " ; return 1 ; fi @@ -3842,7 +4126,8 @@ mkmaildir() { #f5# Change the xterm title from within GNU-screen xtrename() { - if [[ ${1} != "-f" ]] ; then + emulate -L zsh + if [[ $1 != "-f" ]] ; then if [[ -z ${DISPLAY} ]] ; then printf 'xtrename only makes sense in X11.\n' return 1 @@ -3850,7 +4135,7 @@ xtrename() { else shift fi - if [[ -z ${1} ]] ; then + if [[ -z $1 ]] ; then printf 'usage: xtrename [-f] "title for xterm"\n' printf ' renames the title of xterm from _within_ screen.\n' printf ' also works without screen.\n' @@ -3865,6 +4150,7 @@ xtrename() { # http://ft.bewatermyfriend.org/comp/data/zsh/zfunct.html if check_com -c highlight ; then function hl() { + emulate -L zsh local theme lang theme=${HL_THEME:-""} case ${1} in @@ -3920,22 +4206,46 @@ if check_com -c highlight ; then compdef _hl_complete hl fi -# create small urls via tinyurl.com using wget, grep and sed -zurl() { - [[ -z ${1} ]] && print "please give an url to shrink." && return 1 - local url=${1} - local tiny="http://tinyurl.com/create.php?url=" - #print "${tiny}${url}" ; return - wget -O- \ - -o/dev/null \ - "${tiny}${url}" \ - | grep -Eio 'value="(http://tinyurl.com/.*)"' \ - | sed 's/value=//;s/"//g' +# Create small urls via http://tinyurl.com using wget(1). +function zurl() { + emulate -L zsh + [[ -z $1 ]] && { print "USAGE: zurl " ; return 1 } + + local PN url tiny grabber search result preview + PN=$0 + url=$1 +# Check existence of given URL with the help of ping(1). +# N.B. ping(1) only works without an eventual given protocol. + ping -c 1 ${${url#(ftp|http)://}%%/*} >& /dev/null || \ + read -q "?Given host ${${url#http://*/}%/*} is not reachable by pinging. Proceed anyway? [y|n] " + + if (( $? == 0 )) ; then +# Prepend 'http://' to given URL where necessary for later output. + [[ ${url} != http(s|)://* ]] && url='http://'${url} + tiny='http://tinyurl.com/create.php?url=' + if check_com -c wget ; then + grabber='wget -O- -o/dev/null' + else + print "wget is not available, but mandatory for ${PN}. Aborting." + fi +# Looking for i.e.`copy('http://tinyurl.com/7efkze')' in TinyURL's HTML code. + search='copy\(?http://tinyurl.com/[[:alnum:]]##*' + result=${(M)${${${(f)"$(${=grabber} ${tiny}${url})"}[(fr)${search}*]}//[()\';]/}%%http:*} +# TinyURL provides the rather new feature preview for more confidence. + preview='http://preview.'${result#http://} + + printf '%s\n\n' "${PN} - Shrinking long URLs via webservice TinyURL ." + printf '%s\t%s\n\n' 'Given URL:' ${url} + printf '%s\t%s\n\t\t%s\n' 'TinyURL:' ${result} ${preview} + else + return 1 + fi } #f2# Print a specific line of file(s). linenr () { # {{{ + emulate -L zsh if [ $# -lt 2 ] ; then print "Usage: linenr [,] " ; return 1 elif [ $# -eq 2 ] ; then @@ -3960,6 +4270,7 @@ linenr () { #f2# Find history events by search pattern and list them by date. whatwhen() { # {{{ + emulate -L zsh local usage help ident format_l format_s first_char remain first last usage='USAGE: whatwhen [options] ' help='Use' \`'whatwhen -h'\'' for further explanations.' @@ -4008,6 +4319,7 @@ whatwhen() { # change fluxbox keys from 'Alt-#' to 'Alt-F#' and vice versa fluxkey-change() { + emulate -L zsh [[ -n "$FLUXKEYS" ]] || local FLUXKEYS="$HOME/.fluxbox/keys" if ! [[ -r "$FLUXKEYS" ]] ; then echo "Sorry, \$FLUXKEYS file $FLUXKEYS could not be read - nothing to be done." @@ -4029,6 +4341,7 @@ fluxkey-change() { # retrieve weather information on the console # Usage example: 'weather LOWG' weather() { + emulate -L zsh [[ -n "$1" ]] || { print 'Usage: weather ' >&2 print 'List of stations: http://en.wikipedia.org/wiki/List_of_airports_by_ICAO_code'>&2 @@ -4072,6 +4385,7 @@ if check_com -c hg ; then # http://www.selenic.com/mercurial/wiki/index.cgi/TipsAndTricks #f5# GNU like diff for mercurial hgdi() { + emulate -L zsh for i in $(hg status -marn "$@") ; diff -ubwd <(hg cat "$i") "$i" } @@ -4087,12 +4401,13 @@ if check_com -c hg ; then # hgstat 1234 => display diffstat between revision 1234 and tip #f5# Diffstat for specific version of a mercurial repos hgstat() { + emulate -L zsh [[ -n "$1" ]] && hg diff -r $1 -r tip | diffstat || hg export tip | diffstat } #f5# Get current mercurial tip via hg itself gethgclone() { - setopt local_options + emulate -L zsh setopt errreturn if [[ -f mercurial-tree/.hg ]] ; then cd mercurial-tree @@ -4121,7 +4436,7 @@ fi # end of check whether we have the 'hg'-executable # get current mercurial snapshot #f5# Get current mercurial snapshot gethgsnap() { - setopt local_options + emulate -L zsh setopt errreturn if [[ -f mercurial-snapshot.tar.gz ]] ; then echo "mercurial-snapshot.tar.gz exists already, skipping download." @@ -4216,14 +4531,7 @@ fi #}}} -# finally source a local zshrc {{{ - -# this allows us to stay in sync with grml's zshrc and put own -# modifications in ~/.zshrc.local - -xsource "${HOME}/.zshrc.local" - -# }}} +zrclocal ## genrefcard.pl settings {{{