X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=a20ad4927fbedde57592a2620a57557c3fd58c20;hb=3b0fb3cb7dca219f0e6280b77056d7d5261f7a01;hp=40f58d58adb0d843f1a8065ed50820309b41fe5b;hpb=48a14371ae6e0a0ff6264ed826457b178cf950cb;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 40f58d5..a20ad49 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -103,6 +103,14 @@ # *all* aliases, for example, use @@INSERT-aliases-all@@. #}}} +# Only load once +[[ ${(t)GRML} != *association* ]] && typeset -gA GRML +if (( ${GRML[ZSHRC_LOADED]} )); then + return 0 +else + GRML[ZSHRC_LOADED]=1 +fi + # zsh profiling {{{ # just execute 'ZSH_PROFILE_RC=1 zsh' and run 'zprof' to get the details if [[ $ZSH_PROFILE_RC -gt 0 ]] ; then @@ -256,13 +264,6 @@ 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 @@ -417,14 +418,13 @@ 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 @@ -571,20 +571,71 @@ bindkey -e # use vi style: # bindkey -v +## beginning-of-line OR beginning-of-buffer OR beginning of history +## by: Bart Schaefer , Bernhard Tittelbach +beginning-or-end-of-somewhere() { + local hno=$HISTNO + if [[ ( "${LBUFFER[-1]}" == $'\n' && "${WIDGET}" == beginning-of* ) || \ + ( "${RBUFFER[1]}" == $'\n' && "${WIDGET}" == end-of* ) ]]; then + zle .${WIDGET:s/somewhere/buffer-or-history/} "$@" + else + zle .${WIDGET:s/somewhere/line-hist/} "$@" + if (( HISTNO != hno )); then + zle .${WIDGET:s/somewhere/buffer-or-history/} "$@" + fi + fi +} +zle -N beginning-of-somewhere beginning-or-end-of-somewhere +zle -N end-of-somewhere beginning-or-end-of-somewhere + + #if [[ "$TERM" == screen ]] ; then -bindkey '\e[1~' beginning-of-line # home -bindkey '\e[4~' end-of-line # end + +## with HOME/END, move to beginning/end of line (on multiline) on first keypress +## to beginning/end of buffer on second keypress +## and to beginning/end of history on (at most) the third keypress +# terminator & non-debian xterm +bindkey '\eOH' beginning-of-somewhere # home +bindkey '\eOF' end-of-somewhere # end +# freebsd console +bindkey '\e[H' beginning-of-somewhere # home +bindkey '\e[F' end-of-somewhere # end +# xterm,gnome-terminal,quake,etc +bindkey '^[[1~' beginning-of-somewhere # home +bindkey '^[[4~' end-of-somewhere # end +# if terminal type is set to 'rxvt': +bindkey '\e[7~' beginning-of-somewhere # home +bindkey '\e[8~' end-of-somewhere # end +#fi + bindkey '\e[A' up-line-or-search # cursor up bindkey '\e[B' down-line-or-search # - -bindkey '^xp' history-beginning-search-backward -bindkey '^xP' history-beginning-search-forward +## alt-backspace is already the default for backwards-delete-word +## let's also set alt-delete for deleting current word (right of cursor) +#k# Delete current word +bindkey "3~" delete-word + +## use Ctrl-left-arrow and Ctrl-right-arrow for jumping to word-beginnings on the CL +bindkey "\e[5C" forward-word +bindkey "\e[5D" backward-word +bindkey "\e[1;5C" forward-word +bindkey "\e[1;5D" backward-word +## the same for alt-left-arrow and alt-right-arrow +bindkey '^[[1;3C' forward-word +bindkey '^[[1;3D' backward-word + +# Search backward in the history for a line beginning with the current +# line up to the cursor and move the cursor to the end of the line then +zle -N history-beginning-search-backward-end history-search-end +zle -N history-beginning-search-forward-end history-search-end +bindkey '^xp' history-beginning-search-backward-end +bindkey '^xP' history-beginning-search-forward-end +bindkey "\e[5~" history-beginning-search-backward-end # PageUp +bindkey "\e[6~" history-beginning-search-forward-end # PageDown + # bindkey -s '^L' "|less\n" # ctrl-L pipes to less # bindkey -s '^B' " &\n" # ctrl-B runs it in the background -# if terminal type is set to 'rxvt': -bindkey '\e[7~' beginning-of-line # home -bindkey '\e[8~' end-of-line # end -#fi # insert unicode character # usage example: 'ctrl-x i' 00A7 'ctrl-x i' will give you an ยง @@ -636,6 +687,10 @@ zle -N slash-backward-kill-word #k# Kill everything in a word up to its last \kbd{/} bindkey '\ev' slash-backward-kill-word +#k# Kill everything in a word up to its last \kbd{/} +bindkey '\e^h' slash-backward-kill-word +#k# Kill everything in a word up to its last \kbd{/} +bindkey '\e^?' slash-backward-kill-word # use the new *-pattern-* widgets for incremental history search if is439 ; then @@ -897,6 +952,9 @@ fi if is4 && [[ -n ${(k)modules[zsh/complist]} ]] ; then #k# menu selection: pick item but stay in the menu bindkey -M menuselect '\e^M' accept-and-menu-complete + # also use + and INSERT since it's easier to press repeatedly + bindkey -M menuselect "+" accept-and-menu-complete + bindkey -M menuselect "^[[2~" accept-and-menu-complete # accept a completion and try to complete again by using menu # completion; very useful with completing directories @@ -935,7 +993,10 @@ bindkey '^z' grml-zsh-fg # run command line as user root via sudo: sudo-command-line() { [[ -z $BUFFER ]] && zle up-history - [[ $BUFFER != sudo\ * ]] && BUFFER="sudo $BUFFER" + if [[ $BUFFER != sudo\ * ]]; then + BUFFER="sudo $BUFFER" + CURSOR=$(( CURSOR+5 )) + fi } zle -N sudo-command-line @@ -958,6 +1019,33 @@ zle -N jump_after_first_word bindkey '^x1' jump_after_first_word +# complete word from history with menu (from Book: ZSH, OpenSource-Press) +zle -C hist-complete complete-word _generic +zstyle ':completion:hist-complete:*' completer _history +#k# complete word from history with menu +bindkey "^X^X" hist-complete + +## complete word from currently visible SCREEN buffer. +if check_com -c screen ; then + _complete_screen_display() { + [[ "$TERM" != "screen" ]] && return 1 + + local TMPFILE=$(mktemp) + local -U -a _screen_display_wordlist + trap "rm -f $TMPFILE" EXIT + + screen -X hardcopy $TMPFILE + # fill array with contents from screen hardcopy + _screen_display_wordlist=( ${(QQ)$(<$TMPFILE)} ) + # remove PREFIX to be completed from that array + _screen_display_wordlist[${_screen_display_wordlist[(i)$PREFIX]}]="" + compadd -a _screen_display_wordlist + } + #k# complete word from currently visible GNU screen buffer + bindkey -r "^XS" + compdef -k _complete_screen_display complete-word '^XS' +fi + # }}} # {{{ history @@ -1131,851 +1219,22 @@ fi # gather version control information for inclusion in a prompt {{{ -if ! is41 ; then - # Be quiet about version problems in grml's zshrc as the user cannot disable - # loading vcs_info() as it is *in* the zshrc - as you can see. :-) - # Just unset most probable variables and disable vcs_info altogether. - local -i i - for i in {0..9} ; do - unset VCS_INFO_message_${i}_ - done - zstyle ':vcs_info:*' enable false -fi - if zrcautoload vcs_info; then - GRML_VCS_INFO=0 -else -# I'm not reindenting the whole code below. -GRML_VCS_INFO=1 - -# The following code is imported from the file 'zsh/functions/vcs_info' -# from , -# which distributed under the same terms as zsh itself. - -# we will be using two variables, so let the code know now. -zstyle ':vcs_info:*' max-exports 2 - -# vcs_info() documentation: -#{{{ -# REQUIREMENTS: -#{{{ -# This functionality requires zsh version >= 4.1.*. -#}}} -# -# LOADING: -#{{{ -# To load vcs_info(), copy this file to your $fpath[] and do: -# % autoload -Uz vcs_info && vcs_info -# -# To work, vcs_info() needs 'setopt prompt_subst' in your setup. -#}}} -# -# QUICKSTART: -#{{{ -# To get vcs_info() working quickly (including colors), you can do the -# following (assuming, you loaded vcs_info() properly - see above): -# -# % RED=$'%{\e[31m%}' -# % GR=$'%{\e[32m%}' -# % MA=$'%{\e[35m%}' -# % YE=$'%{\e[33m%}' -# % NC=$'%{\e[0m%}' -# -# % zstyle ':vcs_info:*' actionformats \ -# "${MA}(${NC}%s${MA})${YE}-${MA}[${GR}%b${YE}|${RED}%a${MA}]${NC} " -# -# % zstyle ':vcs_info:*' formats \ -# "${MA}(${NC}%s${MA})${Y}-${MA}[${GR}%b${MA}]${NC}%} " -# -# % zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat "%b${RED}:${YE}%r" -# -# % precmd () { vcs_info } -# % PS1='${MA}[${GR}%n${MA}] ${MA}(${RED}%!${MA}) ${YE}%3~ ${VCS_INFO_message_0_}${NC}%# ' -# -# Obviously, the las two lines are there for demonstration: You need to -# call vcs_info() from your precmd() function (see 'SPECIAL FUNCTIONS' in -# 'man zshmisc'). Once that is done you need a *single* quoted -# '${VCS_INFO_message_0_}' in your prompt. -# -# Now call the 'vcs_info_printsys' utility from the command line: -# -# % vcs_info_printsys -# # list of supported version control backends: -# # disabled systems are prefixed by a hash sign (#) -# git -# hg -# bzr -# darcs -# svk -# mtn -# svn -# cvs -# cdv -# tla -# # flavours (cannot be used in the disable style; they -# # are disabled with their master [git-svn -> git]): -# git-p4 -# git-svn -# -# Ten version control backends as you can see. You may not want all -# of these. Because there is no point in running the code to detect -# systems you do not use. ever. So, there is a way to disable some -# backends altogether: -# -# % zstyle ':vcs_info:*' disable bzr cdv darcs mtn svk tla -# -# If you rerun 'vcs_info_printsys' now, you will see the backends listed -# in the 'disable' style marked as diabled by a hash sign. That means the -# detection of these systems is skipped *completely*. No wasted time there. -# -# For more control, read the reference below. -#}}} -# -# CONFIGURATION: -#{{{ -# The vcs_info() feature can be configured via zstyle. -# -# First, the context in which we are working: -# :vcs_info:: -# -# ...where is one of: -# - git, git-svn, git-p4, hg, darcs, bzr, cdv, mtn, svn, cvs, svk or tla. -# -# ...and is a freely configurable string, assignable by the -# user as the first argument to vcs_info() (see its description below). -# -# There is are three special values for : The first is named -# 'init', that is in effect as long as there was no decision what vcs -# backend to use. The second is 'preinit; it is used *before* vcs_info() -# is run, when initializing the data exporting variables. The third -# special value is 'formats' and is used by the 'vcs_info_lastmsg' for -# looking up its styles. -# -# There are two pre-defined values for : -# default - the one used if none is specified -# command - used by vcs_info_lastmsg to lookup its styles. -# -# You may *not* use 'print_systems_' as a user-context string, because it -# is used internally. -# -# You can of course use ':vcs_info:*' to match all VCSs in all -# user-contexts at once. -# -# Another special context is 'formats', which is used by the -# vcs_info_lastmsg() utility function (see below). -# -# -# This is a description of all styles, that are looked up: -# formats - A list of formats, used when actionformats is not -# used (which is most of the time). -# actionformats - A list of formats, used if a there is a special -# action going on in your current repository; -# (like an interactive rebase or a merge conflict) -# branchformat - Some backends replace %b in the formats and -# actionformats styles above, not only by a branch -# name but also by a revision number. This style -# let's you modify how that string should look like. -# nvcsformats - These "formats" are exported, when we didn't detect -# a version control system for the current directory. -# This is useful, if you want vcs_info() to completely -# take over the generation of your prompt. -# You would do something like -# PS1='${VCS_INFO_message_0_}' -# to accomplish that. -# max-exports - Defines the maximum number if VCS_INFO_message_*_ -# variables vcs_info() will export. -# enable - Checked in the 'init' context. If set to false, -# vcs_info() will do nothing. -# disable - Provide a list of systems, you don't want -# the vcs_info() to check for repositories -# (checked in the 'init' context, too). -# disable-patterns - A list of patterns that are checked against $PWD. -# If the pattern matches, vcs_info will be disabled. -# Say, ~/.zsh is a directory under version control, -# in which you do not want vcs_info to be active, do: -# zstyle ':vcs_info:*' disable-patterns "$HOME/.zsh+(|/*)" -# use-simple - If there are two different ways of gathering -# information, you can select the simpler one -# by setting this style to true; the default -# is to use the not-that-simple code, which is -# potentially a lot slower but might be more -# accurate in all possible cases. -# use-prompt-escapes - determines if we assume that the assembled -# string from vcs_info() includes prompt escapes. -# (Used by vcs_info_lastmsg(). -# -# The use-simple style is only available for the bzr backend. -# -# The default values for these in all contexts are: -# formats " (%s)-[%b|%a]-" -# actionformats " (%s)-[%b]-" -# branchformat "%b:%r" (for bzr, svn and svk) -# nvcsformats "" -# max-exports 2 -# enable true -# disable (empty list) -# disable-patterns (empty list) -# use-simple false -# use-prompt-escapes true -# -# -# In normal formats and actionformats, the following replacements -# are done: -# %s - The vcs in use (git, hg, svn etc.) -# %b - Information about the current branch. -# %a - An identifier, that describes the action. -# Only makes sense in actionformats. -# %R - base directory of the repository. -# %r - repository name -# If %R is '/foo/bar/repoXY', %r is 'repoXY'. -# %S - subdirectory within a repository. if $PWD is -# '/foo/bar/reposXY/beer/tasty', %S is 'beer/tasty'. -# -# -# In branchformat these replacements are done: -# %b - the branch name -# %r - the current revision number -# -# Not all vcs backends have to support all replacements. -# nvcsformat does not perform *any* replacements. It is just a string. -#}}} -# -# ODDITIES: -#{{{ -# If you want to use the %b (bold off) prompt expansion in 'formats', which -# expands %b itself, use %%b. That will cause the vcs_info() expansion to -# replace %%b with %b. So zsh's prompt expansion mechanism can handle it. -# Similarly, to hand down %b from branchformat, use %%%%b. Sorry for this -# inconvenience, but it cannot be easily avoided. Luckily we do not clash -# with a lot of prompt expansions and this only needs to be done for those. -# See 'man zshmisc' for details about EXPANSION OF PROMPT SEQUENCES. -#}}} -# -# FUNCTION DESCRIPTIONS (public API): -#{{{ -# vcs_info() -# The main function, that runs all backends and assembles -# all data into ${VCS_INFO_message_*_}. This is the function -# you want to call from precmd() if you want to include -# up-to-date information in your prompt (see VARIABLE -# DESCRIPTION below). -# -# vcs_info_printsys() -# Prints a list of all supported version control systems. -# Useful to find out possible contexts (and which of them are enabled) -# or values for the 'disable' style. -# -# vcs_info_lastmsg() -# Outputs the last ${VCS_INFO_message_*_} value. Takes into account -# the value of the use-prompt-escapes style in ':vcs_info:formats'. -# It also only prints max-exports values. -# -# All functions named VCS_INFO_* are for internal use only. -#}}} -# -# VARIABLE DESCRIPTION: -#{{{ -# ${VCS_INFO_message_N_} (Note the trailing underscore) -# Where 'N' is an integer, eg: VCS_INFO_message_0_ -# These variables are the storage for the informational message the -# last vcs_info() call has assembled. These are strongly connected -# to the formats, actionformats and nvcsformats styles described -# above. Those styles are lists. the first member of that list gets -# expanded into ${VCS_INFO_message_0_}, the second into -# ${VCS_INFO_message_1_} and the Nth into ${VCS_INFO_message_N-1_}. -# These parameters are exported into the environment. -# (See the max-exports style above.) -#}}} -# -# EXAMPLES: -#{{{ -# Don't use vcs_info at all (even though it's in your prompt): -# % zstyle ':vcs_info:*' enable false -# -# Disable the backends for bzr and svk: -# % zstyle ':vcs_info:*' disable bzr svk -# -# Provide a special formats for git: -# % zstyle ':vcs_info:git:*' formats ' GIT, BABY! [%b]' -# % zstyle ':vcs_info:git:*' actionformats ' GIT ACTION! [%b|%a]' -# -# Use the quicker bzr backend (if you do, please report if it does -# the-right-thing[tm] - thanks): -# % zstyle ':vcs_info:bzr:*' use-simple true -# -# Display the revision number in yellow for bzr and svn: -# % zstyle ':vcs_info:(svn|bzr):*' branchformat '%b%{'${fg[yellow]}'%}:%r' -# -# If you want colors, make sure you enclose the color codes in %{...%}, -# if you want to use the string provided by vcs_info() in prompts. -# -# Here is how to print the vcs infomation as a command: -# % alias vcsi='vcs_info command; vcs_info_lastmsg' -# -# This way, you can even define different formats for output via -# vcs_info_lastmsg() in the ':vcs_info:command:*' namespace. -#}}} -#}}} -# utilities -VCS_INFO_adjust () { #{{{ - [[ -n ${vcs_comm[overwrite_name]} ]] && vcs=${vcs_comm[overwrite_name]} - return 0 -} -# }}} -VCS_INFO_check_com () { #{{{ - (( ${+commands[$1]} )) && [[ -x ${commands[$1]} ]] && return 0 - return 1 -} -# }}} -VCS_INFO_formats () { # {{{ - setopt localoptions noksharrays - local action=$1 branch=$2 base=$3 - local msg - local -i i - - if [[ -n ${action} ]] ; then - zstyle -a ":vcs_info:${vcs}:${usercontext}" actionformats msgs - (( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b|%a]-' - else - zstyle -a ":vcs_info:${vcs}:${usercontext}" formats msgs - (( ${#msgs} < 1 )) && msgs[1]=' (%s)-[%b]-' - fi - - (( ${#msgs} > maxexports )) && msgs[$(( maxexports + 1 )),-1]=() - for i in {1..${#msgs}} ; do - 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 () { #{{{ - 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} - printf 'Defaulting to 2.\n' - maxexports=2 - fi -} -# }}} -VCS_INFO_nvcsformats () { #{{{ - setopt localoptions noksharrays - local c v - - if [[ $1 == 'preinit' ]] ; then - c=default - v=preinit - fi - zstyle -a ":vcs_info:${v:-$vcs}:${c:-$usercontext}" nvcsformats msgs - (( ${#msgs} > maxexports )) && msgs[${maxexports},-1]=() -} -# }}} -VCS_INFO_realpath () { #{{{ - # a portable 'readlink -f' - # forcing a subshell, to ensure chpwd() is not removed - # from the calling shell (if VCS_INFO_realpath() is called - # manually). - ( - (( ${+functions[chpwd]} )) && unfunction chpwd - setopt chaselinks - cd $1 2>/dev/null && pwd - ) -} -# }}} -VCS_INFO_reposub () { #{{{ - setopt localoptions extendedglob - local base=${1%%/##} - - [[ ${PWD} == ${base}/* ]] || { - printf '.' - return 1 - } - printf '%s' ${PWD#$base/} - return 0 -} -# }}} -VCS_INFO_set () { #{{{ - setopt localoptions noksharrays - local -i i j - - if [[ $1 == '--clear' ]] ; then - for i in {0..9} ; do - unset VCS_INFO_message_${i}_ - done - fi - if [[ $1 == '--nvcs' ]] ; then - [[ $2 == 'preinit' ]] && (( maxexports == 0 )) && (( maxexports = 1 )) - for i in {0..$((maxexports - 1))} ; do - typeset -gx VCS_INFO_message_${i}_= - done - VCS_INFO_nvcsformats $2 - fi - - (( ${#msgs} - 1 < 0 )) && return 0 - for i in {0..$(( ${#msgs} - 1 ))} ; do - (( j = i + 1 )) - typeset -gx VCS_INFO_message_${i}_=${msgs[$j]} - done - return 0 -} -# }}} -# information gathering -VCS_INFO_bzr_get_data () { # {{{ - setopt localoptions noksharrays - local bzrbase bzrbr - local -a bzrinfo - - if zstyle -t ":vcs_info:${vcs}:${usercontext}" "use-simple" ; then - bzrbase=${vcs_comm[basedir]} - bzrinfo[2]=${bzrbase:t} - if [[ -f ${bzrbase}/.bzr/branch/last-revision ]] ; then - bzrinfo[1]=$(< ${bzrbase}/.bzr/branch/last-revision) - bzrinfo[1]=${${bzrinfo[1]}%% *} - fi - else - bzrbase=${${(M)${(f)"$( bzr info )"}:# ##branch\ root:*}/*: ##/} - bzrinfo=( ${${${(M)${(f)"$( bzr version-info )"}:#(#s)(revno|branch-nick)*}/*: /}/*\//} ) - bzrbase="$(VCS_INFO_realpath ${bzrbase})" - fi - - zstyle -s ":vcs_info:${vcs}:${usercontext}" branchformat bzrbr || bzrbr="%b:%r" - zformat -f bzrbr "${bzrbr}" "b:${bzrinfo[2]}" "r:${bzrinfo[1]}" - VCS_INFO_formats '' "${bzrbr}" "${bzrbase}" - return 0 -} -# }}} -VCS_INFO_cdv_get_data () { # {{{ - local cdvbase - - cdvbase=${vcs_comm[basedir]} - VCS_INFO_formats '' "${cdvbase:t}" "${cdvbase}" - return 0 -} -# }}} -VCS_INFO_cvs_get_data () { # {{{ - local cvsbranch cvsbase basename - - cvsbase="." - while [[ -d "${cvsbase}/../CVS" ]]; do - cvsbase="${cvsbase}/.." - done - cvsbase="$(VCS_INFO_realpath ${cvsbase})" - cvsbranch=$(< ./CVS/Repository) - basename=${cvsbase:t} - cvsbranch=${cvsbranch##${basename}/} - [[ -z ${cvsbranch} ]] && cvsbranch=${basename} - VCS_INFO_formats '' "${cvsbranch}" "${cvsbase}" - return 0 -} -# }}} -VCS_INFO_darcs_get_data () { # {{{ - local darcsbase - - darcsbase=${vcs_comm[basedir]} - VCS_INFO_formats '' "${darcsbase:t}" "${darcsbase}" - return 0 -} -# }}} -VCS_INFO_git_getaction () { #{{{ - local gitaction='' gitdir=$1 - local tmp - - for tmp in "${gitdir}/rebase-apply" \ - "${gitdir}/rebase" \ - "${gitdir}/../.dotest" ; do - if [[ -d ${tmp} ]] ; then - if [[ -f "${tmp}/rebasing" ]] ; then - gitaction="rebase" - elif [[ -f "${tmp}/applying" ]] ; then - gitaction="am" - else - gitaction="am/rebase" - fi - printf '%s' ${gitaction} - return 0 - fi - done - - for tmp in "${gitdir}/rebase-merge/interactive" \ - "${gitdir}/.dotest-merge/interactive" ; do - if [[ -f "${tmp}" ]] ; then - printf '%s' "rebase-i" - return 0 - fi - done - - for tmp in "${gitdir}/rebase-merge" \ - "${gitdir}/.dotest-merge" ; do - if [[ -d "${tmp}" ]] ; then - printf '%s' "rebase-m" - return 0 - fi - done - - if [[ -f "${gitdir}/MERGE_HEAD" ]] ; then - printf '%s' "merge" - return 0 - fi - - if [[ -f "${gitdir}/BISECT_LOG" ]] ; then - printf '%s' "bisect" - return 0 - fi - return 1 -} -# }}} -VCS_INFO_git_getbranch () { #{{{ - local gitbranch gitdir=$1 tmp actiondir - local gitsymref='git symbolic-ref HEAD' - - actiondir='' - for tmp in "${gitdir}/rebase-apply" \ - "${gitdir}/rebase" \ - "${gitdir}/../.dotest"; do - if [[ -d ${tmp} ]]; then - actiondir=${tmp} - break - fi - done - if [[ -n ${actiondir} ]]; then - gitbranch="$(${(z)gitsymref} 2> /dev/null)" - [[ -z ${gitbranch} ]] && [[ -r ${actiondir}/head-name ]] \ - && gitbranch="$(< ${actiondir}/head-name)" - - elif [[ -f "${gitdir}/MERGE_HEAD" ]] ; then - gitbranch="$(${(z)gitsymref} 2> /dev/null)" - [[ -z ${gitbranch} ]] && gitbranch="$(< ${gitdir}/MERGE_HEAD)" - - elif [[ -d "${gitdir}/rebase-merge" ]] ; then - gitbranch="$(< ${gitdir}/rebase-merge/head-name)" - - elif [[ -d "${gitdir}/.dotest-merge" ]] ; then - gitbranch="$(< ${gitdir}/.dotest-merge/head-name)" - - else - gitbranch="$(${(z)gitsymref} 2> /dev/null)" - - if [[ $? -ne 0 ]] ; then - gitbranch="refs/tags/$(git describe --exact-match HEAD 2>/dev/null)" - - if [[ $? -ne 0 ]] ; then - gitbranch="${${"$(< $gitdir/HEAD)"}[1,7]}..." - fi - fi - fi - - printf '%s' "${gitbranch##refs/[^/]##/}" - return 0 -} -# }}} -VCS_INFO_git_get_data () { # {{{ - setopt localoptions extendedglob - local gitdir gitbase gitbranch gitaction - - gitdir=${vcs_comm[gitdir]} - gitbranch="$(VCS_INFO_git_getbranch ${gitdir})" - - if [[ -z ${gitdir} ]] || [[ -z ${gitbranch} ]] ; then - return 1 + # `vcs_info' in zsh versions 4.3.10 and below have a broken `_realpath' + # function, which can cause a lot of trouble with our directory-based + # profiles. So: + if [[ ${ZSH_VERSION} == 4.3.<-10> ]] ; then + function VCS_INFO_realpath () { + setopt localoptions NO_shwordsplit chaselinks + ( builtin cd -q $1 2> /dev/null && pwd; ) + } fi - VCS_INFO_adjust - gitaction="$(VCS_INFO_git_getaction ${gitdir})" - gitbase=${PWD%/${$( git rev-parse --show-prefix )%/##}} - VCS_INFO_formats "${gitaction}" "${gitbranch}" "${gitbase}" - return 0 -} -# }}} -VCS_INFO_hg_get_data () { # {{{ - local hgbranch hgbase file - - hgbase=${vcs_comm[basedir]} + zstyle ':vcs_info:*' max-exports 2 - file="${hgbase}/.hg/branch" - if [[ -r ${file} ]] ; then - hgbranch=$(< ${file}) - else - hgbranch='default' + if [[ -o restricted ]]; then + zstyle ':vcs_info:*' enable NONE fi - - VCS_INFO_formats '' "${hgbranch}" "${hgbase}" - return 0 -} -# }}} -VCS_INFO_mtn_get_data () { # {{{ - local mtnbranch mtnbase - - mtnbase=${vcs_comm[basedir]} - mtnbranch=${${(M)${(f)"$( mtn status )"}:#(#s)Current branch:*}/*: /} - VCS_INFO_formats '' "${mtnbranch}" "${mtnbase}" - return 0 -} -# }}} -VCS_INFO_svk_get_data () { # {{{ - local svkbranch svkbase - - svkbase=${vcs_comm[basedir]} - zstyle -s ":vcs_info:${vcs}:${usercontext}" branchformat svkbranch || svkbranch="%b:%r" - zformat -f svkbranch "${svkbranch}" "b:${vcs_comm[branch]}" "r:${vcs_comm[revision]}" - VCS_INFO_formats '' "${svkbranch}" "${svkbase}" - return 0 -} -# }}} -VCS_INFO_svn_get_data () { # {{{ - setopt localoptions noksharrays - local svnbase svnbranch - local -a svninfo - - svnbase="." - while [[ -d "${svnbase}/../.svn" ]]; do - svnbase="${svnbase}/.." - done - svnbase="$(VCS_INFO_realpath ${svnbase})" - svninfo=( ${${${(M)${(f)"$( svn info )"}:#(#s)(URL|Revision)*}/*: /}/*\//} ) - - zstyle -s ":vcs_info:${vcs}:${usercontext}" branchformat svnbranch || svnbranch="%b:%r" - zformat -f svnbranch "${svnbranch}" "b:${svninfo[1]}" "r:${svninfo[2]}" - VCS_INFO_formats '' "${svnbranch}" "${svnbase}" - return 0 -} -# }}} -VCS_INFO_tla_get_data () { # {{{ - local tlabase tlabranch - - tlabase="$(VCS_INFO_realpath ${vcs_comm[basedir]})" - # tree-id gives us something like 'foo@example.com/demo--1.0--patch-4', so: - tlabranch=${${"$( tla tree-id )"}/*\//} - VCS_INFO_formats '' "${tlabranch}" "${tlabase}" - return 0 -} -# }}} -# detection -VCS_INFO_detect_by_dir() { #{{{ - local dirname=$1 - local basedir="." realbasedir - - realbasedir="$(VCS_INFO_realpath ${basedir})" - while [[ ${realbasedir} != '/' ]]; do - [[ -r ${realbasedir} ]] || return 1 - if [[ -n ${vcs_comm[detect_need_file]} ]] ; then - [[ -d ${basedir}/${dirname} ]] && \ - [[ -e ${basedir}/${dirname}/${vcs_comm[detect_need_file]} ]] && \ - break - else - [[ -d ${basedir}/${dirname} ]] && break - fi - - basedir=${basedir}/.. - realbasedir="$(VCS_INFO_realpath ${basedir})" - done - - [[ ${realbasedir} == "/" ]] && return 1 - vcs_comm[basedir]=${realbasedir} - return 0 -} -# }}} -VCS_INFO_bzr_detect() { #{{{ - VCS_INFO_check_com bzr || return 1 - vcs_comm[detect_need_file]=branch/format - VCS_INFO_detect_by_dir '.bzr' - return $? -} -# }}} -VCS_INFO_cdv_detect() { #{{{ - VCS_INFO_check_com cdv || return 1 - vcs_comm[detect_need_file]=format - VCS_INFO_detect_by_dir '.cdv' - return $? -} -# }}} -VCS_INFO_cvs_detect() { #{{{ - VCS_INFO_check_com cvs || return 1 - [[ -d "./CVS" ]] && [[ -r "./CVS/Repository" ]] && return 0 - return 1 -} -# }}} -VCS_INFO_darcs_detect() { #{{{ - VCS_INFO_check_com darcs || return 1 - vcs_comm[detect_need_file]=format - VCS_INFO_detect_by_dir '_darcs' - return $? -} -# }}} -VCS_INFO_git_detect() { #{{{ - if VCS_INFO_check_com git && git rev-parse --is-inside-work-tree &> /dev/null ; then - vcs_comm[gitdir]="$(git rev-parse --git-dir 2> /dev/null)" || return 1 - if [[ -d ${vcs_comm[gitdir]}/svn ]] ; then vcs_comm[overwrite_name]='git-svn' - elif [[ -d ${vcs_comm[gitdir]}/refs/remotes/p4 ]] ; then vcs_comm[overwrite_name]='git-p4' ; fi - return 0 - fi - return 1 -} -# }}} -VCS_INFO_hg_detect() { #{{{ - VCS_INFO_check_com hg || return 1 - vcs_comm[detect_need_file]=store - VCS_INFO_detect_by_dir '.hg' - return $? -} -# }}} -VCS_INFO_mtn_detect() { #{{{ - VCS_INFO_check_com mtn || return 1 - vcs_comm[detect_need_file]=revision - VCS_INFO_detect_by_dir '_MTN' - return $? -} -# }}} -VCS_INFO_svk_detect() { #{{{ - setopt localoptions noksharrays extendedglob - local -a info - local -i fhash - fhash=0 - - VCS_INFO_check_com svk || return 1 - [[ -f ~/.svk/config ]] || return 1 - - # This detection function is a bit different from the others. - # We need to read svk's config file to detect a svk repository - # in the first place. Therefore, we'll just proceed and read - # the other information, too. This is more then any of the - # other detections do but this takes only one file open for - # svk at most. VCS_INFO_svk_get_data() get simpler, too. :-) - while IFS= read -r line ; do - if [[ -n ${vcs_comm[basedir]} ]] ; then - line=${line## ##} - [[ ${line} == depotpath:* ]] && vcs_comm[branch]=${line##*/} - [[ ${line} == revision:* ]] && vcs_comm[revision]=${line##*[[:space:]]##} - [[ -n ${vcs_comm[branch]} ]] && [[ -n ${vcs_comm[revision]} ]] && break - continue - fi - (( fhash > 0 )) && [[ ${line} == ' '[^[:space:]]*:* ]] && break - [[ ${line} == ' hash:'* ]] && fhash=1 && continue - (( fhash == 0 )) && continue - [[ ${PWD}/ == ${${line## ##}%:*}/* ]] && vcs_comm[basedir]=${${line## ##}%:*} - done < ~/.svk/config - - [[ -n ${vcs_comm[basedir]} ]] && \ - [[ -n ${vcs_comm[branch]} ]] && \ - [[ -n ${vcs_comm[revision]} ]] && return 0 - return 1 -} -# }}} -VCS_INFO_svn_detect() { #{{{ - VCS_INFO_check_com svn || return 1 - [[ -d ".svn" ]] && return 0 - return 1 -} -# }}} -VCS_INFO_tla_detect() { #{{{ - VCS_INFO_check_com tla || return 1 - vcs_comm[basedir]="$(tla tree-root 2> /dev/null)" && return 0 - return 1 -} -# }}} -# public API -vcs_info_printsys () { # {{{ - vcs_info print_systems_ -} -# }}} -vcs_info_lastmsg () { # {{{ - emulate -L zsh - local -i i - - VCS_INFO_maxexports - for i in {0..$((maxexports - 1))} ; do - printf '$VCS_INFO_message_%d_: "' $i - if zstyle -T ':vcs_info:formats:command' use-prompt-escapes ; then - print -nP ${(P)${:-VCS_INFO_message_${i}_}} - else - print -n ${(P)${:-VCS_INFO_message_${i}_}} - fi - printf '"\n' - done -} -# }}} -vcs_info () { # {{{ - emulate -L zsh - setopt extendedglob - - [[ -r . ]] || return 1 - - local pat - local -i found - local -a VCSs disabled dps - local -x vcs usercontext - local -ix maxexports - local -ax msgs - local -Ax vcs_comm - - vcs="init" - VCSs=(git hg bzr darcs svk mtn svn cvs cdv tla) - case $1 in - (print_systems_) - zstyle -a ":vcs_info:${vcs}:${usercontext}" "disable" disabled - print -l '# list of supported version control backends:' \ - '# disabled systems are prefixed by a hash sign (#)' - for vcs in ${VCSs} ; do - [[ -n ${(M)disabled:#${vcs}} ]] && printf '#' - printf '%s\n' ${vcs} - done - print -l '# flavours (cannot be used in the disable style; they' \ - '# are disabled with their master [git-svn -> git]):' \ - git-{p4,svn} - return 0 - ;; - ('') - [[ -z ${usercontext} ]] && usercontext=default - ;; - (*) [[ -z ${usercontext} ]] && usercontext=$1 - ;; - esac - - zstyle -T ":vcs_info:${vcs}:${usercontext}" "enable" || { - [[ -n ${VCS_INFO_message_0_} ]] && VCS_INFO_set --clear - return 0 - } - zstyle -a ":vcs_info:${vcs}:${usercontext}" "disable" disabled - - zstyle -a ":vcs_info:${vcs}:${usercontext}" "disable-patterns" dps - for pat in ${dps} ; do - if [[ ${PWD} == ${~pat} ]] ; then - [[ -n ${vcs_info_msg_0_} ]] && VCS_INFO_set --clear - return 0 - fi - done - - VCS_INFO_maxexports - - (( found = 0 )) - for vcs in ${VCSs} ; do - [[ -n ${(M)disabled:#${vcs}} ]] && continue - vcs_comm=() - VCS_INFO_${vcs}_detect && (( found = 1 )) && break - done - - (( found == 0 )) && { - VCS_INFO_set --nvcs - return 0 - } - - VCS_INFO_${vcs}_get_data || { - VCS_INFO_set --nvcs - return 1 - } - - VCS_INFO_set - return 0 -} - -VCS_INFO_set --nvcs preinit -# }}} - fi # Change vcs_info formats for the grml prompt. The 2nd format sets up @@ -1995,9 +1254,6 @@ else zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat "%b${RED}:${YELLOW}%r" fi -if [[ -o restricted ]]; then - zstyle ':vcs_info:*' enable false -fi # }}} @@ -2040,9 +1296,7 @@ function info_print () { esc_end="$2" shift 2 printf '%s' ${esc_begin} - for item in "$@" ; do - printf '%s ' "$item" - done + printf '%s' "$*" printf '%s' "${esc_end}" } @@ -2054,9 +1308,7 @@ is4 && [[ $NOPRECMD -eq 0 ]] && precmd () { vcs_info if [[ $TERM == screen* ]] ; then - if [[ -n ${VCS_INFO_message_1_} ]] ; then - ESC_print ${VCS_INFO_message_1_} - elif [[ -n ${vcs_info_msg_1_} ]] ; then + if [[ -n ${vcs_info_msg_1_} ]] ; then ESC_print ${vcs_info_msg_1_} else ESC_print "zsh" @@ -2135,11 +1387,7 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< " fi fi -if (( GRML_VCS_INFO )); then - PROMPT="${PROMPT}"'${VCS_INFO_message_0_}'"%# " -else - PROMPT="${PROMPT}"'${vcs_info_msg_0_}'"%# " -fi +PROMPT="${PROMPT}"'${vcs_info_msg_0_}'"%# " # if we are inside a grml-chroot set a specific prompt theme if [[ -n "$GRML_CHROOT" ]] ; then @@ -2274,7 +1522,7 @@ if ! check_com asc &>/dev/null ; then fi # get top 10 shell commands: -alias top10='print -l ? ${(o)history%% *} | uniq -c | sort -nr | head -n 10' +alias top10='print -l ${(o)history%% *} | uniq -c | sort -nr | head -n 10' # truecrypt; use e.g. via 'truec /dev/ice /mnt/ice' or 'truec -i' if check_com -c truecrypt ; then @@ -2632,28 +1880,6 @@ grmlcomp() { # {{{ grmlstuff grmlstuff() { # people should use 'grml-x'! - startx() { - if [[ -e /etc/X11/xorg.conf ]] ; then - [[ -x /usr/bin/startx ]] && /usr/bin/startx "$@" || /usr/X11R6/bin/startx "$@" - else - echo "Please use the script \"grml-x\" for starting the X Window System -because there does not exist /etc/X11/xorg.conf yet. -If you want to use startx anyway please call \"/usr/bin/startx\"." - return -1 - fi - } - - xinit() { - if [[ -e /etc/X11/xorg.conf ]] ; then - [[ -x /usr/bin/xinit ]] && /usr/bin/xinit || /usr/X11R6/bin/xinit - else - echo "Please use the script \"grml-x\" for starting the X Window System. -because there does not exist /etc/X11/xorg.conf yet. -If you want to use xinit anyway please call \"/usr/bin/xinit\"." - return -1 - fi - } - if check_com -c 915resolution; then 855resolution() { echo "Please use 915resolution as resolution modifying tool for Intel \ @@ -2805,7 +2031,7 @@ compdef _aliases edalias #f1# Edit a function via zle edfunc() { - [[ -z "$1" ]] && { echo "Usage: edfun " ; return 1 } || zed -f "$1" ; + [[ -z "$1" ]] && { echo "Usage: edfunc " ; return 1 } || zed -f "$1" ; } compdef _functions edfunc @@ -2840,8 +2066,15 @@ if [[ -d /etc/init.d || -d /etc/service ]] ; then fi } + _grmlinitd() { + local -a scripts + scripts=( /etc/init.d/*(x:t) ) + _describe "service startup script" scripts + } + for i in Start Restart Stop Force-Reload Reload ; do eval "$i() { __start_stop $i \"\$1\" \"\$2\" ; }" + compdef _grmlinitd $i done fi @@ -2891,18 +2124,16 @@ check_com -c qma && alias ?='qma zshall' # grep for running process, like: 'any vim' any() { emulate -L zsh + unsetopt KSH_ARRAYS if [[ -z "$1" ]] ; then echo "any - grep for process(es) by keyword" >&2 echo "Usage: any " >&2 ; return 1 else - local STRING=$1 - local LENGTH=$(expr length $STRING) - local FIRSCHAR=$(echo $(expr substr $STRING 1 1)) - local REST=$(echo $(expr substr $STRING 2 $LENGTH)) - ps xauwww| grep "[$FIRSCHAR]$REST" + ps xauwww | grep --color=auto "[${1[1]}]${1[2,-1]}" fi } + # After resuming from suspend, system is paging heavily, leading to very bad interactivity. # taken from $LINUX-KERNELSOURCE/Documentation/power/swsusp.txt [[ -r /proc/1/maps ]] && \ @@ -3089,14 +2320,14 @@ exit 0; ssl_hashes=( sha512 sha256 sha1 md5 ) for sh in ${ssl_hashes}; do - ssl-cert-${sh}() { + eval 'ssl-cert-'${sh}'() { emulate -L zsh if [[ -z $1 ]] ; then - printf 'usage: %s \n' "ssh-cert-${sh}" + printf '\''usage: %s \n'\'' "ssh-cert-'${sh}'" return 1 fi - openssl x509 -noout -fingerprint -${sh} -in $1 - } + openssl x509 -noout -fingerprint -'${sh}' -in $1 + }' done; unset sh ssl-cert-fingerprints() { @@ -3134,6 +2365,9 @@ if [[ -r ~/.important_commands ]] ; then fi # }}} +# load the lookup subsystem if it's available on the system +zrcautoload lookupinit && lookupinit + #:grep:marker:for:mika: :-) ### non-root (EUID != 0) code below ### @@ -3143,8 +2377,6 @@ if (( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) ; then return 0 fi -zrcautoload lookupinit && lookupinit - # variables {{{ # set terminal property (used e.g. by msgid-chooser) @@ -3218,9 +2450,9 @@ alias lsd='ls -d *(/)' # only show directories #a2# Only show empty directories alias lse='ls -d *(/^F)' # only show empty directories #a2# Display the ten newest files -alias lsnew="ls -rl *(D.om[1,10])" # display the newest files +alias lsnew="ls -rtlh *(D.om[1,10])" # display the newest files #a2# Display the ten oldest files -alias lsold="ls -rtlh *(D.om[1,10])" # display the oldest files +alias lsold="ls -rtlh *(D.Om[1,10])" # display the oldest files #a2# Display the ten smallest files alias lssmall="ls -Srl *(.oL[1,10])" # display the smallest files @@ -3435,10 +2667,51 @@ fir() { mcd() { mkdir -p "$@" && cd "$@" } +#f5# Create temporary directory and \kbd{cd} to it +cdt() { + local t + t=$(mktemp -d) + echo "$t" + builtin cd "$t" +} #f5# Unified diff to timestamped outputfile mdiff() { diff -udrP "$1" "$2" > diff.`date "+%Y-%m-%d"`."$1" } + +#f5# Create directory under cursor or the selected area +# Press ctrl-xM to create the directory under the cursor or the selected area. +# To select an area press ctrl-@ or ctrl-space and use the cursor. +# Use case: you type "mv abc ~/testa/testb/testc/" and remember that the +# directory does not exist yet -> press ctrl-XM and problem solved +inplaceMkDirs() { + local PATHTOMKDIR + if ((REGION_ACTIVE==1)); then + local F=$MARK T=$CURSOR + if [[ $F -gt $T ]]; then + F=${CURSOR} + T=${MARK} + fi + # get marked area from buffer and eliminate whitespace + PATHTOMKDIR=${BUFFER[F+1,T]%%[[:space:]]##} + PATHTOMKDIR=${PATHTOMKDIR##[[:space:]]##} + else + local bufwords iword + bufwords=(${(z)LBUFFER}) + iword=${#bufwords} + bufwords=(${(z)BUFFER}) + PATHTOMKDIR="$bufwords[iword]" + fi + [[ -z "${PATHTOMKDIR}" ]] && return 1 + if [[ -e "${PATHTOMKDIR}" ]]; then + zle -M " path already exists, doing nothing" + else + zle -M "$(mkdir -p -v "${PATHTOMKDIR}")" + zle end-of-line + fi +} +zle -N inplaceMkDirs && bindkey '^XM' inplaceMkDirs + #f5# Memory overview memusage() { ps aux | awk '{if (NR > 1) print $5; if (NR > 2) print "+"} END { print "p" }' | dc @@ -3560,29 +2833,6 @@ alias GREP='grep -i --color=auto' #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 -#f5# Jump between directories -d() { - emulate -L zsh - autoload -U colors - local color=$fg_bold[blue] - integer i=0 - dirs -p | while read dir; do - local num="${$(printf "%-4d " $i)/ /.}" - printf " %s $color%s$reset_color\n" $num $dir - (( i++ )) - done - integer dir=-1 - read -r 'dir?Jump to directory: ' || return - (( dir == -1 )) && return - if (( dir < 0 || dir >= i )); then - echo d: no such directory stack entry: $dir - return 1 - fi - cd ~$dir -} - # usage example: 'lcheck strcpy' #f5# Find out which libs define a symbol lcheck() { @@ -3595,15 +2845,24 @@ lcheck() { #f5# Clean up directory - remove well known tempfiles purge() { - FILES=(*~(N) .*~(N) \#*\#(N) *.o(N) a.out(N) *.core(N) *.cmo(N) *.cmi(N) .*.swp(N)) - NBFILES=${#FILES} + emulate -L zsh + setopt HIST_SUBST_PATTERN + local -a TEXTEMPFILES GHCTEMPFILES PYTEMPFILES FILES + TEXTEMPFILES=(*.tex(N:s/%tex/'(log|toc|aux|nav|snm|out|tex.backup|bbl|blg|bib.backup|vrb|lof|lot|hd|idx)(N)'/)) + GHCTEMPFILES=(*.(hs|lhs)(N:r:s/%/'.(hi|hc|(p|u|s)_(o|hi))(N)'/)) + PYTEMPFILES=(*.py(N:s/%py/'(pyc|pyo)(N)'/)) + LONELY_MOOD_FILES=((*.mood)(NDe:'local -a AF;AF=( ${${REPLY#.}%mood}(mp3|flac|ogg|asf|wmv|aac)(N) ); [[ -z "$AF" ]]':)) + FILES=(*~(.N) \#*\#(.N) *.o(.N) a.out(.N) (*.|)core(.N) *.cmo(.N) *.cmi(.N) .*.swp(.N) *.(orig|rej)(.DN) *.dpkg-(old|dist|new)(DN) ._(cfg|mrg)[0-9][0-9][0-9][0-9]_*(N) ${~TEXTEMPFILES} ${~GHCTEMPFILES} ${~PYTEMPFILES} ${LONELY_MOOD_FILES}) + local NBFILES=${#FILES} + local CURDIRSUDO="" + [[ ! -w ./ ]] && CURDIRSUDO=$SUDO if [[ $NBFILES > 0 ]] ; then - print $FILES + print -l $FILES local ans echo -n "Remove these files? [y/n] " read -q ans if [[ $ans == "y" ]] ; then - rm ${FILES} + $CURDIRSUDO rm ${FILES} echo ">> $PWD purged, $NBFILES files removed" else echo "Ok. .. then not.." @@ -3611,6 +2870,27 @@ purge() { fi } +#f5# show labels and uuids of disk devices +if is439 && [[ -d /dev/disk/by-id/ ]]; then + lsdisk() { + emulate -L zsh + setopt extendedglob + local -a -U disks + disks=( /dev/disk/by-id/*(@:A) ) + for dev in "$disks[@]"; do + print ${fg_bold[red]}${dev}${reset_color} /dev/disk/by-label/*(@e/'[[ ${REPLY:A} == $dev ]] && REPLY=${fg[blue]}LABEL=${REPLY:t}${reset_color}'/N) /dev/disk/by-uuid/*(@e/'[[ ${REPLY:A} == $dev ]] && REPLY=${fg[green]}UUID=${REPLY:t}${reset_color}'/N) + print -f " %s\n" /dev/disk/by-id/*(@e/'[[ ${REPLY:A} == $dev ]]'/N:t) + done + } +fi + +#f5# run command or function in a list of directories +rundirs() { + local d CMD STARTDIR=$PWD + CMD=$1; shift + ( for d ($@) {cd -q $d && { print cd $d; ${(z)CMD} ; cd -q $STARTDIR }} ) +} + # Translate DE<=>EN # 'translate' looks up fot a word in a file with language-to-language # translations (field separator should be " : "). A typical wordlist looks @@ -3674,30 +2954,159 @@ selhist() { } # Usage: simple-extract +# Using option -d deletes the original archive file. #f5# Smart archive extractor -simple-extract () { - emulate -L zsh - if [[ -f $1 ]] ; then - case $1 in - *.tar.bz2) bzip2 -v -d $1 ;; - *.tar.gz) tar -xvzf $1 ;; - *.rar) unrar $1 ;; - *.deb) ar -x $1 ;; - *.bz2) bzip2 -d $1 ;; - *.lzh) lha x $1 ;; - *.gz) gunzip -d $1 ;; - *.tar) tar -xvf $1 ;; - *.tgz) gunzip -d $1 ;; - *.tbz2) tar -jxvf $1 ;; - *.zip) unzip $1 ;; - *.Z) uncompress $1 ;; - *) echo "'$1' Error. Please go away" ;; +simple-extract() { + emulate -L zsh + setopt extended_glob noclobber + local DELETE_ORIGINAL DECOMP_CMD USES_STDIN USES_STDOUT GZTARGET WGET_CMD + local RC=0 + zparseopts -D -E "d=DELETE_ORIGINAL" + for ARCHIVE in "${@}"; do + case $ARCHIVE in + *.(tar.bz2|tbz2|tbz)) + DECOMP_CMD="tar -xvjf -" + USES_STDIN=true + USES_STDOUT=false + ;; + *.(tar.gz|tgz)) + DECOMP_CMD="tar -xvzf -" + USES_STDIN=true + USES_STDOUT=false + ;; + *.(tar.xz|txz|tar.lzma)) + DECOMP_CMD="tar -xvJf -" + USES_STDIN=true + USES_STDOUT=false + ;; + *.tar) + DECOMP_CMD="tar -xvf -" + USES_STDIN=true + USES_STDOUT=false + ;; + *.rar) + DECOMP_CMD="unrar x" + USES_STDIN=false + USES_STDOUT=false + ;; + *.lzh) + DECOMP_CMD="lha x" + USES_STDIN=false + USES_STDOUT=false + ;; + *.7z) + DECOMP_CMD="7z x" + USES_STDIN=false + USES_STDOUT=false + ;; + *.(zip|jar)) + DECOMP_CMD="unzip" + USES_STDIN=false + USES_STDOUT=false + ;; + *.deb) + DECOMP_CMD="ar -x" + USES_STDIN=false + USES_STDOUT=false + ;; + *.bz2) + DECOMP_CMD="bzip2 -d -c -" + USES_STDIN=true + USES_STDOUT=true + ;; + *.(gz|Z)) + DECOMP_CMD="gzip -d -c -" + USES_STDIN=true + USES_STDOUT=true + ;; + *.(xz|lzma)) + DECOMP_CMD="xz -d -c -" + USES_STDIN=true + USES_STDOUT=true + ;; + *) + print "ERROR: '$ARCHIVE' has unrecognized archive type." >&2 + RC=$((RC+1)) + continue + ;; esac - else - echo "'$1' is not a valid file" - fi + + if ! check_com ${DECOMP_CMD[(w)1]}; then + echo "ERROR: ${DECOMP_CMD[(w)1]} not installed." >&2 + RC=$((RC+2)) + continue + fi + + GZTARGET="${ARCHIVE:t:r}" + if [[ -f $ARCHIVE ]] ; then + + print "Extracting '$ARCHIVE' ..." + if $USES_STDIN; then + if $USES_STDOUT; then + ${=DECOMP_CMD} < "$ARCHIVE" > $GZTARGET + else + ${=DECOMP_CMD} < "$ARCHIVE" + fi + else + if $USES_STDOUT; then + ${=DECOMP_CMD} "$ARCHIVE" > $GZTARGET + else + ${=DECOMP_CMD} "$ARCHIVE" + fi + fi + [[ $? -eq 0 && -n "$DELETE_ORIGINAL" ]] && rm -f "$ARCHIVE" + + elif [[ "$ARCHIVE" == (#s)(https|http|ftp)://* ]] ; then + if check_com curl; then + WGET_CMD="curl -k -s -o -" + elif check_com wget; then + WGET_CMD="wget -q -O - --no-check-certificate" + else + print "ERROR: neither wget nor curl is installed" >&2 + RC=$((RC+4)) + continue + fi + print "Downloading and Extracting '$ARCHIVE' ..." + if $USES_STDIN; then + if $USES_STDOUT; then + ${=WGET_CMD} "$ARCHIVE" | ${=DECOMP_CMD} > $GZTARGET + RC=$((RC+$?)) + else + ${=WGET_CMD} "$ARCHIVE" | ${=DECOMP_CMD} + RC=$((RC+$?)) + fi + else + if $USES_STDOUT; then + ${=DECOMP_CMD} =(${=WGET_CMD} "$ARCHIVE") > $GZTARGET + else + ${=DECOMP_CMD} =(${=WGET_CMD} "$ARCHIVE") + fi + fi + + else + print "ERROR: '$ARCHIVE' is neither a valid file nor a supported URI." >&2 + RC=$((RC+8)) + fi + done + return $RC +} + +__archive_or_uri() +{ + _alternative \ + 'files:Archives:_files -g "*.(#l)(tar.bz2|tbz2|tbz|tar.gz|tgz|tar.xz|txz|tar.lzma|tar|rar|lzh|7z|zip|jar|deb|bz2|gz|Z|xz|lzma)"' \ + '_urls:Remote Archives:_urls' } +_simple_extract() +{ + _arguments \ + '-d[delete original archivefile after extraction]' \ + '*:Archive Or Uri:__archive_or_uri' +} +compdef _simple_extract simple-extract +alias se=simple-extract + # Usage: smartcompress () #f5# Smart archive creator smartcompress() { @@ -3742,7 +3151,11 @@ show-archive() { #f5# Use \kbd{vim} as your manpage reader vman() { emulate -L zsh - man $* | col -b | view -c 'set ft=man nomod nolist' - + if (( ${#argv} == 0 )); then + printf 'usage: vman \n' + return 1 + fi + man "$@" | col -b | view -c 'set ft=man nomod nolist' - } # function readme() { $PAGER -- (#ia3)readme* } @@ -3785,6 +3198,7 @@ refunc() { autoload $func done } +compdef _functions refunc # a small check to see which DIR is located on which server/partition. # stolen and modified from Sven's zshrc.forall @@ -3923,11 +3337,52 @@ allulimit() { ulimit -t unlimited } -# ogg2mp3 with bitrate of 192 -ogg2mp3_192() { - emulate -L zsh - oggdec -o - $1 | lame -b 192 - ${1:r}.mp3 -} +# 2mp3 transcodes flac and ogg to mp3 with bitrate of 192 while preserving basic tags +if check_com lame; then + 2mp3_192() { + emulate -L zsh + setopt extendedglob + unsetopt ksharrays + + local -a DECODE id3tags + local -A tagmap + local tagdata + local RC=0 + tagmap=("(#l)title" --tt "(#l)artist" --ta "(#l)tracknumber" --tn "(#l)genre" --tg "(#l)album" --tl) + + if [[ ${@[(i)*.ogg]} -le ${#@} ]] && ! check_com oggdec; then + echo "ERROR: please install oggdec" >&2 + return 1 + fi + if [[ ${@[(i)*.flac]} -le ${#@} ]] && ! check_com flac; then + echo "ERROR: please install flac" >&2 + return 1 + fi + + for af in "$@"; do + id3tags=() + case "$af" in + (*.flac) + DECODE=(flac -d -c "$af") + tagdata="$(metaflac --export-tags-to=- "$af")" + ;; + (*.ogg) + DECODE=(oggdec -Q -o - "$af") + tagdata="$(ogginfo "$af")" + ;; + (*) continue ;; + esac + for line (${(f)tagdata}) \ + [[ "$line" == (#s)[[:space:]]#(#b)([^=]##)=(*)(#e) && -n $tagmap[(k)$match[1]] ]] && \ + id3tags+=($tagmap[(k)$match[1]] "$match[2]") + [[ ${#id3tags} -gt 0 ]] && id3tags=(--add-id3v2 --ignore-tag-errors $id3tags) + $DECODE[*] | lame -b 192 -v -h --replaygain-fast "${id3tags[@]}" - "${af:r}.mp3" || {RC=$?; print "Error transcoding" "${af}"; } + done + # return 0 if no error or exit code if at least one error happened + return $RC + } + alias ogg2mp3_192 2mp3_192 +fi #f5# RFC 2396 URL encoding in Z-Shell urlencode() {