X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=abe6a225d2cd4387c9173f4a39a17f3e9d6a6b6c;hb=01fe02eb822310ffaace189928cfa9108c4fc1ab;hp=c5e3c76fb00ddd5e126a41ad6d9a1b4c82084047;hpb=44964b9307d67abd91aeecfe69e52b58d7c41b76;p=grml-etc-core.git
diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index c5e3c76..abe6a22 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -11,6 +11,13 @@
# Global Order: zshenv, zprofile, zshrc, zlogin
################################################################################
+# USAGE
+# If you are using this file as your ~/.zshrc file, please use ~/.zshrc.pre
+# and ~/.zshrc.local for your own customisations. The former file is read
+# before ~/.zshrc, the latter is read after it. Also, consider reading the
+# refcard and the reference manual for this setup, both available from:
+#
+
# Contributing:
# If you want to help to improve grml's zsh setup, clone the grml-etc-core
# repository from git.grml.org:
@@ -134,7 +141,12 @@ is43(){
}
is433(){
- [[ $ZSH_VERSION == 4.3.<3->* || $ZSH_VERSION == <5->* ]] && return 0
+ [[ $ZSH_VERSION == 4.3.<3->* || $ZSH_VERSION == 4.<4->* || $ZSH_VERSION == <5->* ]] && return 0
+ return 1
+}
+
+is439(){
+ [[ $ZSH_VERSION == 4.3.<9->* || $ZSH_VERSION == 4.<4->* || $ZSH_VERSION == <5->* ]] && return 0
return 1
}
@@ -244,13 +256,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
@@ -276,6 +281,7 @@ 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
+setopt unset # don't error out when unset parameters are used
# }}}
@@ -291,79 +297,6 @@ 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}
-else
- GRML_WARN_SKEL=${GRML_WARN_SKEL:-1}
-fi
-
-if (( GRML_WARN_SKEL != 0 )) ; then
-
-function grml_warn_skel_main() {
- printf '
-Dear user,
-
-You updated grml'\''s zshrc which brings a major change.
-The configuration is kept only in one file, being the global zshrc.
-In the past, the configuration was split in two files, with the
-second file being the .zshrc file from /etc/skel.
-
-If you have a .zshrc file in your home directory that originally
-came from the skel directory, please remove it. This is also the case
-if you followed earlier instructions from the grml-zsh-refcard or
-from on non-grml systems.
-
-Please see the current grml-zsh-refcard (available at
-) for updated installation information. In short,
-you don'\''t want a .zshrc.global file. Install the global zshrc to
-~/.zshrc and be done.
-
-If you need changes to the configuration, use ~/.zshrc.pre and
-~/.zshrc.local.
-
-'
-}
-
-function grml_warn_skel_remove() {
- printf 'To remove this warning execute '\''grml_do_not_warn_skel'\''.\n\n'
-}
-
-function grml_do_not_warn_skel() {
- printf '# Do not warn about old skel dot-files anymore\n' >>! ~/.zshrc.pre
- printf 'GRML_WARN_SKEL=0\n' >>! ~/.zshrc.pre
-}
-
-# let's try to guess how the user uses us.
-if is-at-least 4.3.7 ; then
- # funcsourcetrace requires at least version 4.3.7 of zsh.
- GRML_SRC_FILE="${${funcsourcetrace[1]}%:*}"
-
- grml_warn_skel_main
- case ${GRML_SRC_FILE} in
- (${HOME}/.zshrc.global)
- grml_warn_skel_remove
- printf '\nIt looks like you copied the grml zshrc to '\''~/.zshrc.global'\''.\n'
- printf 'Nowadays you just copy the global zshrc to '\''~/.zshrc'\'' to use\n'
- printf 'it on a non-grml-system.\n'
- ;;
- (${HOME}/.zshrc)
- printf '\nIt looks like you copied the grml zshrc to '\''~/.zshrc'\''.\n'
- printf 'We'\''ll disable this warning automatically for later sessions.\n'
- grml_do_not_warn_skel
- ;;
- (*)
- grml_do_not_warn_skel
- ;;
- esac
-else
- grml_warn_skel_main
- grml_warn_skel_remove
-fi
-
-unfunction grml_warn_skel_remove grml_warn_skel_main
-
-fi # GRML_WARN_SKEL
-
# }}}
# utility functions {{{
@@ -477,14 +410,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
@@ -540,32 +472,6 @@ xsource "/etc/sysconfig/keyboard"
TZ=$(xcat /etc/timezone)
# }}}
-# check for potentially old files in 'completion.d' {{{
-setopt extendedglob
-xof=(/etc/zsh/completion.d/*~/etc/zsh/completion.d/_*(N))
-if (( ${#xof} > 0 )) ; then
- printf '\n -!- INFORMATION\n\n'
- printf ' -!- %s file(s) not starting with an underscore (_) found in\n' ${#xof}
- printf ' -!- /etc/zsh/completion.d/.\n\n'
- printf ' -!- While this has been the case in old versions of grml-etc-core,\n'
- printf ' -!- recent versions of the grml-zsh-setup have all these files rewritten\n'
- printf ' -!- and renamed. Furthermore, the grml-zsh-setup will *only* add files\n'
- printf ' -!- named _* to that directory.\n\n'
- printf ' -!- If you added functions to completion.d yourself, please consider\n'
- printf ' -!- moving them to /etc/zsh/functions.d/. Files in that directory, not\n'
- printf ' -!- starting with an underscore are marked for automatic loading\n'
- printf ' -!- by default (so that is quite convenient).\n\n'
- printf ' -!- If there are files *not* starting with an underscore from an older\n'
- printf ' -!- grml-etc-core in completion.d, you may safely remove them.\n\n'
- printf ' -!- Delete the files for example via running:\n\n'
- printf " rm ${xof}\n\n"
- printf ' -!- Note, that this message will *not* go away, unless you yourself\n'
- printf ' -!- resolve the situation manually.\n\n'
- BROKEN_COMPLETION_DIR=1
-fi
-unset xof
-# }}}
-
# {{{ set some variables
if check_com -c vim ; then
#v#
@@ -599,7 +505,7 @@ fi
isdarwin && xsource /sw/bin/init.sh
# load our function and completion directories
-for fdir in /usr/share/grml/zsh/completion /usr/share/grml/functions; do
+for fdir in /usr/share/grml/zsh/completion /usr/share/grml/zsh/functions; do
fpath=( ${fdir} ${fdir}/**/*(/N) ${fpath} )
if [[ ${fpath} == '/usr/share/grml/zsh/functions' ]] ; then
for func in ${fdir}/**/[^_]*[^~](N.) ; do
@@ -657,20 +563,67 @@ 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 # -
+## 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
+
bindkey '^xp' history-beginning-search-backward
bindkey '^xP' history-beginning-search-forward
+bindkey "\e[5~" history-beginning-search-backward #PageUp
+bindkey "\e[6~" history-beginning-search-forward #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 ยง
@@ -680,18 +633,12 @@ zle -N insert-unicode-char
#k# Insert Unicode character
bindkey '^Xi' insert-unicode-char
-# just type 'cd ...' to get 'cd ../..'
-# rationalise-dot() {
-# if [[ $LBUFFER == *.. ]] ; then
-# LBUFFER+=/..
-# else
-# LBUFFER+=.
-# fi
-# }
-# zle -N rationalise-dot
-# bindkey . rationalise-dot
-
-# bindkey '\eq' push-line-or-edit
+#m# k Shift-tab Perform backwards menu completion
+if [[ -n "$terminfo[kcbt]" ]]; then
+ bindkey "$terminfo[kcbt]" reverse-menu-complete
+elif [[ -n "$terminfo[cbt]" ]]; then # required for GNU screen
+ bindkey "$terminfo[cbt]" reverse-menu-complete
+fi
## toggle the ,. abbreviation feature on/off
# NOABBREVIATION: default abbreviation-state
@@ -728,7 +675,16 @@ 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
+ bindkey '^r' history-incremental-pattern-search-backward
+ bindkey '^s' history-incremental-pattern-search-forward
+fi
# }}}
# a generic accept-line wrapper {{{
@@ -751,7 +707,7 @@ bindkey '\ev' slash-backward-kill-word
zstyle ':acceptline:*' rehash true
function Accept-Line() {
- setopt localoptions noksharrays
+ emulate -L zsh
local -a subs
local -xi aldone
local sub
@@ -770,6 +726,7 @@ function Accept-Line() {
}
function Accept-Line-getdefault() {
+ emulate -L zsh
local default_action
zstyle -s ":acceptline:${alcontext}" default_action default_action
@@ -784,7 +741,7 @@ function Accept-Line-getdefault() {
}
function accept-line() {
- setopt localoptions noksharrays
+ emulate -L zsh
local -a cmdline
local -x alcontext
local buf com fname format msg default_action
@@ -960,17 +917,9 @@ done
# autoload zsh modules when they are referenced
if is4 ; then
- tmpargs=(
- a stat
- a zpty
- ap mapfile
- )
-
- while (( ${#tmpargs} > 0 )) ; do
- zmodload -${tmpargs[1]} zsh/${tmpargs[2]} ${tmpargs[2]}
- shift 2 tmpargs
- done
- unset tmpargs
+ zmodload -a zsh/stat zstat
+ zmodload -a zsh/zpty zpty
+ zmodload -ap zsh/mapfile mapfile
fi
if is4 && zrcautoload insert-files && zle -N insert-files ; then
@@ -991,6 +940,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
@@ -999,11 +951,11 @@ if is4 && [[ -n ${(k)modules[zsh/complist]} ]] ; then
fi
# press "ctrl-e d" to insert the actual date in the form yyyy-mm-dd
-_bkdate() { BUFFER="$BUFFER$(date '+%F')"; CURSOR=$#BUFFER; }
-zle -N _bkdate
+insert-datestamp() { LBUFFER+=${(%):-'%D{%Y-%m-%d}'}; }
+zle -N insert-datestamp
#k# Insert a timestamp on the command line (yyyy-mm-dd)
-bindkey '^Ed' _bkdate
+bindkey '^Ed' insert-datestamp
# press esc-m for inserting last typed word again (thanks to caphuso!)
insert-last-typed-word() { zle insert-last-word -- 0 -1 };
@@ -1012,13 +964,27 @@ zle -N insert-last-typed-word;
#k# Insert last typed word
bindkey "\em" insert-last-typed-word
-#k# Shortcut for \kbd{fg}
-bindkey -s '^z' "fg\n"
+function grml-zsh-fg() {
+ if (( ${#jobstates} )); then
+ zle .push-input
+ [[ -o hist_ignore_space ]] && BUFFER=' ' || BUFFER=''
+ BUFFER="${BUFFER}fg"
+ zle .accept-line
+ else
+ zle -M 'No background jobs. Doing nothing.'
+ fi
+}
+zle -N grml-zsh-fg
+#k# A smart shortcut for \kbd{fg}
+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
@@ -1041,6 +1007,12 @@ 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
+
# }}}
# {{{ history
@@ -1225,6 +1197,21 @@ if ! is41 ; then
zstyle ':vcs_info:*' enable false
fi
+if zrcautoload vcs_info; then
+ GRML_VCS_INFO=0
+ # `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
+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.
@@ -1708,30 +1695,38 @@ VCS_INFO_git_getaction () { #{{{
}
# }}}
VCS_INFO_git_getbranch () { #{{{
- local gitbranch gitdir=$1
+ local gitbranch gitdir=$1 tmp actiondir
local gitsymref='git symbolic-ref HEAD'
- if [[ -d "${gitdir}/rebase-apply" ]] \
- || [[ -d "${gitdir}/rebase" ]] \
- || [[ -d "${gitdir}/../.dotest" ]] \
- || [[ -f "${gitdir}/MERGE_HEAD" ]] ; then
+ 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} ]] && [[ -r ${gitdir}/rebase-apply/head-name ]] \
- && gitbranch="$(< ${gitdir}/rebase-apply/head-name)"
+ [[ -z ${gitbranch} ]] && gitbranch="$(< ${gitdir}/MERGE_HEAD)"
- elif [[ -f "${gitdir}/rebase-merge/interactive" ]] \
- || [[ -d "${gitdir}/rebase-merge" ]] ; then
+ elif [[ -d "${gitdir}/rebase-merge" ]] ; then
gitbranch="$(< ${gitdir}/rebase-merge/head-name)"
- elif [[ -f "${gitdir}/.dotest-merge/interactive" ]] \
- || [[ -d "${gitdir}/.dotest-merge" ]] ; then
+ elif [[ -d "${gitdir}/.dotest-merge" ]] ; then
gitbranch="$(< ${gitdir}/.dotest-merge/head-name)"
else
gitbranch="$(${(z)gitsymref} 2> /dev/null)"
if [[ $? -ne 0 ]] ; then
- gitbranch="$(git describe --exact-match HEAD 2>/dev/null)"
+ gitbranch="refs/tags/$(git describe --exact-match HEAD 2>/dev/null)"
if [[ $? -ne 0 ]] ; then
gitbranch="${${"$(< $gitdir/HEAD)"}[1,7]}..."
@@ -1739,7 +1734,7 @@ VCS_INFO_git_getbranch () { #{{{
fi
fi
- printf '%s' "${gitbranch##refs/heads/}"
+ printf '%s' "${gitbranch##refs/[^/]##/}"
return 0
}
# }}}
@@ -1831,6 +1826,7 @@ VCS_INFO_detect_by_dir() { #{{{
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]} ]] && \
@@ -1863,7 +1859,7 @@ VCS_INFO_cdv_detect() { #{{{
}
# }}}
VCS_INFO_cvs_detect() { #{{{
- VCS_INFO_check_com svn || return 1
+ VCS_INFO_check_com cvs || return 1
[[ -d "./CVS" ]] && [[ -r "./CVS/Repository" ]] && return 0
return 1
}
@@ -1952,6 +1948,7 @@ vcs_info_printsys () { # {{{
}
# }}}
vcs_info_lastmsg () { # {{{
+ emulate -L zsh
local -i i
VCS_INFO_maxexports
@@ -1967,6 +1964,11 @@ vcs_info_lastmsg () { # {{{
}
# }}}
vcs_info () { # {{{
+ emulate -L zsh
+ setopt extendedglob
+
+ [[ -r . ]] || return 1
+
local pat
local -i found
local -a VCSs disabled dps
@@ -2038,6 +2040,8 @@ vcs_info () { # {{{
VCS_INFO_set --nvcs preinit
# }}}
+fi
+
# 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_.
@@ -2055,6 +2059,10 @@ else
zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat "%b${RED}:${YELLOW}%r"
fi
+if [[ -o restricted ]]; then
+ zstyle ':vcs_info:*' enable false
+fi
+
# }}}
# command not found handling {{{
@@ -2082,6 +2090,24 @@ setopt prompt_subst
# make sure to use right prompt only when not running a command
is41 && setopt transient_rprompt
+
+function ESC_print () {
+ info_print $'\ek' $'\e\\' "$@"
+}
+function set_title () {
+ info_print $'\e]0;' $'\a' "$@"
+}
+
+function info_print () {
+ local esc_begin esc_end
+ esc_begin="$1"
+ esc_end="$2"
+ shift 2
+ printf '%s' ${esc_begin}
+ printf '%s' "$*"
+ printf '%s' "${esc_end}"
+}
+
# TODO: revise all these NO* variables and especially their documentation
# in zsh-help() below.
is4 && [[ $NOPRECMD -eq 0 ]] && precmd () {
@@ -2091,9 +2117,11 @@ is4 && [[ $NOPRECMD -eq 0 ]] && precmd () {
if [[ $TERM == screen* ]] ; then
if [[ -n ${VCS_INFO_message_1_} ]] ; then
- print -nP "\ek${VCS_INFO_message_1_}\e\\"
+ ESC_print ${VCS_INFO_message_1_}
+ elif [[ -n ${vcs_info_msg_1_} ]] ; then
+ ESC_print ${vcs_info_msg_1_}
else
- print -nP "\ekzsh\e\\"
+ ESC_print "zsh"
fi
fi
# just use DONTSETRPROMPT=1 to be able to overwrite RPROMPT
@@ -2111,7 +2139,7 @@ is4 && [[ $NOPRECMD -eq 0 ]] && precmd () {
[[ ${NOTITLE} -gt 0 ]] && return 0
case $TERM in
(xterm*|rxvt*)
- print -Pn "\e]0;%n@%m: %~\a"
+ set_title ${(%):-"%n@%m: %~"}
;;
esac
}
@@ -2129,13 +2157,13 @@ preexec () {
if [[ "$TERM" == screen* ]] ; then
# local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} # don't use hostname
local CMD="${1[(wr)^(*=*|sudo|ssh|-*)]}$NAME" # use hostname
- echo -ne "\ek$CMD\e\\"
+ ESC_print ${CMD}
fi
# adjust title of xterm
[[ ${NOTITLE} -gt 0 ]] && return 0
case $TERM in
(xterm*|rxvt*)
- print -Pn "\e]0;%n@%m: $1\a"
+ set_title "${(%):-"%n@%m:"}" "$1"
;;
esac
}
@@ -2152,23 +2180,29 @@ fi
# don't use colors on dumb terminals (like emacs):
if [[ "$TERM" == dumb ]] ; then
- PROMPT="${EXITCODE}${debian_chroot:+($debian_chroot)}%n@%m %40<...<%B%~%b%<< "'${VCS_INFO_message_0_}'"%# "
+ PROMPT="${EXITCODE}${debian_chroot:+($debian_chroot)}%n@%m %40<...<%B%~%b%<< "
else
# only if $GRMLPROMPT is set (e.g. via 'GRMLPROMPT=1 zsh') use the extended prompt
# set variable identifying the chroot you work in (used in the prompt below)
if [[ $GRMLPROMPT -gt 0 ]] ; then
PROMPT="${RED}${EXITCODE}${CYAN}[%j running job(s)] ${GREEN}{history#%!} ${RED}%(3L.+.) ${BLUE}%* %D
-${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< "'${VCS_INFO_message_0_}'"%# "
+${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< "
else
# This assembles the primary prompt string
if (( EUID != 0 )); then
- PROMPT="${RED}${EXITCODE}${WHITE}${debian_chroot:+($debian_chroot)}${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< "'${VCS_INFO_message_0_}'"%# "
+ PROMPT="${RED}${EXITCODE}${WHITE}${debian_chroot:+($debian_chroot)}${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< "
else
- PROMPT="${BLUE}${EXITCODE}${WHITE}${debian_chroot:+($debian_chroot)}${RED}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< "'${VCS_INFO_message_0_}'"%# "
+ PROMPT="${BLUE}${EXITCODE}${WHITE}${debian_chroot:+($debian_chroot)}${RED}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< "
fi
fi
fi
+if (( GRML_VCS_INFO )); then
+ PROMPT="${PROMPT}"'${VCS_INFO_message_0_}'"%# "
+else
+ PROMPT="${PROMPT}"'${vcs_info_msg_0_}'"%# "
+fi
+
# if we are inside a grml-chroot set a specific prompt theme
if [[ -n "$GRML_CHROOT" ]] ; then
PROMPT="%{$fg[red]%}(CHROOT) %{$fg_bold[red]%}%n%{$fg_no_bold[white]%}@%m %40<...<%B%~%b%<< %\# "
@@ -2196,7 +2230,11 @@ if check_com -c screen ; then
elif [[ -r $HOME/.screenrc ]] ; then
alias screen="${commands[screen]} -c $HOME/.screenrc"
else
- [[ -r /etc/grml/screenrc_grml ]] && alias screen="${commands[screen]} -c /etc/grml/screenrc_grml"
+ if [[ -r /etc/grml/screenrc_grml ]]; then
+ alias screen="${commands[screen]} -c /etc/grml/screenrc_grml"
+ else
+ [[ -r /etc/grml/screenrc ]] && alias screen="${commands[screen]} -c /etc/grml/screenrc"
+ fi
fi
fi
@@ -2235,7 +2273,7 @@ alias rm='nocorrect rm' # no spelling correction on rm
#a1# Execute \kbd{rmdir}
alias rd='rmdir'
-#a1# Execute \kbd{rmdir}
+#a1# Execute \kbd{mkdir}
alias md='mkdir'
# see http://www.cl.cam.ac.uk/~mgk25/unicode.html#term for details
@@ -2270,7 +2308,6 @@ swspeak() {
export PS1="%m%# "
/usr/sbin/swspeak-setup $@
else # old version:
- aumix -w 90 -v 90 -p 90 -m 90
if ! [[ -r /dev/softsynth ]] ; then
flite -o play -t "Sorry, software synthesizer not available. Did you boot with swspeak bootoption?"
return 1
@@ -2292,8 +2329,14 @@ check_com 0 || alias 0='return 0'
check_com S &>/dev/null || alias S='screen'
check_com s &>/dev/null || alias s='ssh'
+# especially for roadwarriors using GNU screen and ssh:
+if ! check_com asc &>/dev/null ; then
+ asc() { autossh -t "$@" 'screen -RdU' }
+ compdef asc=ssh
+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
@@ -2437,12 +2480,17 @@ if check_com -c grep-status ; then
fi
# if cdrecord is a symlink (to wodim) or isn't present at all warn:
-if [[ -L /usr/bin/cdrecord ]] || ! check_com -c cdrecord ; then
- if check_com -c wodim ; then
- alias cdrecord="echo 'cdrecord is not provided under its original name by Debian anymore.
+if [[ -L /usr/bin/cdrecord ]] || ! check_com -c cdrecord; then
+ if check_com -c wodim; then
+ cdrecord() {
+ cat <' with menu
- zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
+ # automatically complete 'cd -' and 'cd -' with menu
+ # zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
# insert all expansions for expand completer
zstyle ':completion:*:expand:*' tag-order all-expansions
@@ -2646,30 +2694,12 @@ 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\"."
+ if check_com -c 915resolution; then
+ 855resolution() {
+ echo "Please use 915resolution as resolution modifying tool for Intel \
+graphic chipset."
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
- alias 855resolution='echo -e "Please use 915resolution as resolution modify tool for Intel graphic chipset."; return -1'
+ }
fi
#a1# Output version of running grml
@@ -2681,7 +2711,10 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"."
fi
if check_com -c grml-debootstrap ; then
- alias debian2hd='print "Installing debian to harddisk is possible via using grml-debootstrap." ; return 1'
+ debian2hd() {
+ echo "Installing debian to harddisk is possible by using grml-debootstrap."
+ return 1
+ }
fi
}
# }}}
@@ -2718,23 +2751,7 @@ 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
- [[ -r ~/.zshrc ]] && . ~/.zshrc
- else
- local fn
- for fn in "$@"; do
- unfunction $fn
- autoload -U $fn
- done
- fi
-}
-compdef _functions reload freload
+compdef _functions freload
#f1# List symlinks in detail (more detailed version of 'readlink -f' and 'whence -s')
sll() {
@@ -2828,7 +2845,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
@@ -2914,18 +2931,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 ]] && \
@@ -3020,12 +3035,20 @@ ipv6-tunnel() {
# run dhclient for wireless device
iwclient() {
- salias dhclient "$(wavemon -d | awk '/device/{print $2}')"
+ sudo dhclient "$(wavemon -d | awk '/device/{print $3}')"
}
-# spawn a minimally set up ksh - useful if you want to umount /usr/.
+# spawn a minimally set up mksh - useful if you want to umount /usr/.
minimal-shell() {
- exec env -i ENV="/etc/minimal-shellrc" HOME="$HOME" TERM="$TERM" ksh
+ emulate -L zsh
+ local shell="/bin/mksh"
+
+ if [[ ! -x ${shell} ]]; then
+ printf '`%s'\'' not available, giving up.\n' ${shell} >&2
+ return 1
+ fi
+
+ exec env -i ENV="/etc/minimal-shellrc" HOME="$HOME" TERM="$TERM" ${shell}
}
# a wrapper for vim, that deals with title setting
@@ -3101,6 +3124,41 @@ exit 0;
return $?
}
+ssl_hashes=( sha512 sha256 sha1 md5 )
+
+for sh in ${ssl_hashes}; do
+ eval 'ssl-cert-'${sh}'() {
+ emulate -L zsh
+ if [[ -z $1 ]] ; then
+ printf '\''usage: %s \n'\'' "ssh-cert-'${sh}'"
+ return 1
+ fi
+ openssl x509 -noout -fingerprint -'${sh}' -in $1
+ }'
+done; unset sh
+
+ssl-cert-fingerprints() {
+ emulate -L zsh
+ local i
+ if [[ -z $1 ]] ; then
+ printf 'usage: ssl-cert-fingerprints \n'
+ return 1
+ fi
+ for i in ${ssl_hashes}
+ do ssl-cert-$i $1;
+ done
+}
+
+ssl-cert-info() {
+ emulate -L zsh
+ if [[ -z $1 ]] ; then
+ printf 'usage: ssl-cert-info \n'
+ return 1
+ fi
+ openssl x509 -noout -text -in $1
+ ssl-cert-fingerprints $1
+}
+
# }}}
# {{{ make sure our environment is clean regarding colors
@@ -3114,6 +3172,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
###
@@ -3123,7 +3184,6 @@ if (( GRML_ALWAYS_LOAD_ALL == 0 )) && (( $EUID == 0 )) ; then
return 0
fi
-
# variables {{{
# set terminal property (used e.g. by msgid-chooser)
@@ -3175,20 +3235,6 @@ alias CO="./configure"
#a2# Execute \kbd{./configure --help}
alias CH="./configure --help"
-# arch/tla stuff
-if check_com -c tla ; then
- #a2# Execute \kbd{tla what-changed --diffs | less}
- alias tdi='tla what-changed --diffs | less'
- #a2# Execute \kbd{tla-buildpackage}
- alias tbp='tla-buildpackage'
- #a2# Execute \kbd{tla archive-mirror}
- alias tmi='tla archive-mirror'
- #a2# Execute \kbd{tla commit}
- alias tco='tla commit'
- #a2# Execute \kbd{tla star-merge}
- alias tme='tla star-merge'
-fi
-
# listing stuff
#a2# Execute \kbd{ls -lSrah}
alias dir="ls -lSrah"
@@ -3199,9 +3245,9 @@ alias lsa='ls -a .*(.)' # only show dot-files
#a2# Only files with setgid/setuid/sticky flag
alias lss='ls -l *(s,S,t)' # only files with setgid/setuid/sticky flag
#a2# Only show 1st ten symlinks
-alias lsl='ls -l *(@[1,10])' # only symlinks
+alias lsl='ls -l *(@)' # only symlinks
#a2# Display only executables
-alias lsx='ls -l *(*[1,10])' # only executables
+alias lsx='ls -l *(*)' # only executables
#a2# Display world-{readable,writable,executable} files
alias lsw='ls -ld *(R,W,X.^ND/)' # world-{readable,writable,executable} files
#a2# Display the ten biggest files
@@ -3211,9 +3257,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
@@ -3231,8 +3277,6 @@ alias r-x='chmod 755'
#a2# Execute \kbd{mkdir -o}
alias md='mkdir -p'
-check_com -c ipython && alias ips='ipython -p sh'
-
# console stuff
#a2# Execute \kbd{mplayer -vo fbdev}
alias cmplayer='mplayer -vo fbdev'
@@ -3251,12 +3295,6 @@ check_com -c python && alias http="python -m SimpleHTTPServer"
# Use 'g' instead of 'git':
check_com g || alias g='git'
-# check whether Debian's package management (dpkg) is running
-if check_com salias ; then
- #a2# Check whether a dpkg instance is currently running
- salias check_dpkg_running="dpkg_running"
-fi
-
# work around non utf8 capable software in utf environment via $LANG and luit
if check_com isutfenv && check_com luit ; then
if check_com -c mrxvt ; then
@@ -3382,7 +3420,7 @@ bk() {
#f5# Copied diff
cdiff() {
emulate -L zsh
- diff -crd "$*" | egrep -v "^Only in |^Binary files "
+ diff -crd "$@" | egrep -v "^Only in |^Binary files "
}
#f5# cd to directoy and list files
cl() {
@@ -3426,7 +3464,11 @@ disassemble(){
}
#f5# Firefox remote control - open given URL
fir() {
- firefox -a firefox -remote "openURL($1)"
+ if [ -e /etc/debian_version ]; then
+ firefox -a iceweasel -remote "openURL($1)" || firefox ${1}&
+ else
+ firefox -a firefox -remote "openURL($1)" || firefox ${1}&
+ fi
}
#f5# Create Directoy and \kbd{cd} to it
mcd() {
@@ -3440,26 +3482,16 @@ mdiff() {
memusage() {
ps aux | awk '{if (NR > 1) print $5; if (NR > 2) print "+"} END { print "p" }' | dc
}
-#f5# Show contents of tar file
+#f5# Show contents of gzipped tar file
shtar() {
emulate -L zsh
gunzip -c $1 | tar -tf - -- | $PAGER
}
-#f5# Show contents of tgz file
-shtgz() {
- emulate -L zsh
- tar -ztf $1 | $PAGER
-}
#f5# Show contents of zip file
shzip() {
emulate -L zsh
unzip -l $1 | $PAGER
}
-#f5# Greps signature from file
-sig() {
- emulate -L zsh
- agrep -d '^-- $' "$*" ~/.Signature
-}
#f5# Unified diff
udiff() {
emulate -L zsh
@@ -3510,7 +3542,7 @@ limg() {
if [[ $#images -eq 0 ]] ; then
print "No image files found"
else
- ls "$@" "$images[@]"
+ ls "$images[@]"
fi
}
@@ -3533,11 +3565,25 @@ regcheck() {
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() {
+#f5# List files which have been accessed within the last {\it n} days, {\it n} defaults to 1
+accessed() {
+ emulate -L zsh
+ print -l -- *(a-${1:-1})
+}
+
+#f5# List files which have been changed within the last {\it n} days, {\it n} defaults to 1
+changed() {
+ emulate -L zsh
+ print -l -- *(c-${1:-1})
+}
+
+#f5# List files which have been modified within the last {\it n} days, {\it n} defaults to 1
+modified() {
emulate -L zsh
- print -l *(m-$1)
+ print -l -- *(m-${1:-1})
}
+# modified() was named new() in earlier versions, add an alias for backwards compatibility
+check_com new || alias new=modified
#f5# Grep in history
greph() {
@@ -3553,29 +3599,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() {
@@ -3588,22 +3611,52 @@ 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. .. than not.."
+ echo "Ok. .. then not.."
fi
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
@@ -3735,7 +3788,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* }
@@ -3767,19 +3824,8 @@ ansi-colors() {
done
}
-# suidfind() { ls -latg $path | grep '^...s' }
#f5# Find all files in \$PATH with setuid bit set
-suidfind() { ls -latg $path/*(sN) }
-
-# See above but this is /better/ ... anywise ..
-findsuid() {
- print 'Output will be written to ~/suid_* ...'
- $SUDO find / -type f \( -perm -4000 -o -perm -2000 \) -ls > ~/suid_suidfiles.`date "+%Y-%m-%d"`.out 2>&1
- $SUDO find / -type d \( -perm -4000 -o -perm -2000 \) -ls > ~/suid_suiddirs.`date "+%Y-%m-%d"`.out 2>&1
- $SUDO find / -type f \( -perm -2 -o -perm -20 \) -ls > ~/suid_writefiles.`date "+%Y-%m-%d"`.out 2>&1
- $SUDO find / -type d \( -perm -2 -o -perm -20 \) -ls > ~/suid_writedirs.`date "+%Y-%m-%d"`.out 2>&1
- print 'Finished'
-}
+suidfind() { ls -latg $path | grep '^...s' }
# TODO: So, this is the third incarnation of this function!?
#f5# Reload given functions
@@ -3789,6 +3835,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
@@ -3927,11 +3974,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() {
@@ -3941,112 +4029,6 @@ urlencode() {
print ${(j::)input/(#b)([^A-Za-z0-9_.!~*\'\(\)-])/%${(l:2::0:)$(([##16]#match))}}
}
-#f5# Install x-lite (VoIP software)
-getxlite() {
- emulate -L zsh
- setopt errreturn
- [[ -d ~/tmp ]] || mkdir ~/tmp
- cd ~/tmp
-
- echo "Downloading http://www.counterpath.com/download/X-Lite_Install.tar.gz and storing it in ~/tmp:"
- if wget http://www.counterpath.com/download/X-Lite_Install.tar.gz ; then
- unp X-Lite_Install.tar.gz && echo done || echo failed
- else
- echo "Error while downloading." ; return 1
- fi
-
- if [[ -x xten-xlite/xtensoftphone ]] ; then
- echo "Execute xten-xlite/xtensoftphone to start xlite."
- fi
-}
-
-#f5# Install skype
-getskype() {
- 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'."
- wget http://www.skype.com/go/getskype-linux-deb
- $SUDO dpkg -i skype*.deb && echo "skype installed."
-}
-
-#f5# Install beta-version of skype
-getskypebeta() {
- emulate -L zsh
- setopt errreturn
- echo "Downloading debian package of skype (beta version)."
- wget http://www.skype.com/go/getskype-linux-beta-deb
- $SUDO dpkg -i skype-beta*.deb && echo "skype installed."
-}
-
-#f5# Install gizmo (VoIP software)
-getgizmo() {
- emulate -L zsh
- setopt errreturn
- echo "libgtk2.0-0, gconf2, libstdc++6, libasound2 and zlib1g have to be available. Installing."
- $SUDO apt-get update
- $SUDO apt-get install libgtk2.0-0 gconf2 libstdc++6 libasound2 zlib1g
- wget "$(lynx --dump http://gizmo5.com/pc/download/linux/ | awk '/libstdc\+\+6.*\.deb/ {print $2}')"
- $SUDO dpkg -i gizmo-project*.deb && echo "gizmo installed."
-}
-
-#f5# Get and run AIR (Automated Image and Restore)
-getair() {
- 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'
- wget http://puzzle.dl.sourceforge.net/sourceforge/air-imager/air-$VER.tar.gz
- tar zxf air-$VER.tar.gz
- cd air-$VER
- INTERACTIVE=no $SUDO ./install-air-1.2.8
- [[ -x /usr/local/bin/air ]] && [[ -n "$DISPLAY" ]] && $SUDO air
-}
-
-#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
- if ! [[ -z $1 ]] ; then
- ${=BROWSER} "http://kernel.org/git/?p=$GITTREE;a=commitdiff;h=$1"
- else
- echo "Usage: git-get-diff "
- fi
-}
-
-#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
- if ! [[ -z $1 ]] ; then
- ${=BROWSER} "http://kernel.org/git/?p=$GITTREE;a=commit;h=$1"
- else
- echo "Usage: git-get-commit "
- fi
-}
-
-#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
- if [[ -z $1 ]] ; then
- echo 'Usage: git-get-plaindiff '
- else
- echo -n "Downloading $1.diff ... "
- # avoid "generating ..." stuff from kernel.org server:
- wget --quiet "http://kernel.org/git/?p=$GITTREE;a=commitdiff_plain;h=$1" -O /dev/null
- wget --quiet "http://kernel.org/git/?p=$GITTREE;a=commitdiff_plain;h=$1" -O $1.diff \
- && echo done || echo failed
- fi
-}
-
-
# http://strcat.de/blog/index.php?/archives/335-Software-sauber-deinstallieren...html
#f5# Log 'make install' output
mmake() {
@@ -4084,16 +4066,6 @@ exirename() {
fi
}
-# 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'
- vim ${params}
-}
-
# get_ic() - queries imap servers for capabilities; real simple. no imaps
ic_get() {
emulate -L zsh
@@ -4199,41 +4171,46 @@ if check_com -c highlight ; then
compdef _hl_complete hl
fi
+# TODO:
+# Rewrite this by either using tinyurl.com's API
+# or using another shortening service to comply with
+# tinyurl.com's policy.
+#
# 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
-}
+#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 () {
@@ -4266,7 +4243,7 @@ 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.'
+ help='Use `whatwhen -h'\'' for further explanations.'
ident=${(l,${#${:-Usage: }},, ,)}
format_l="${ident}%s\t\t\t%s\n"
format_s="${format_l//(\\t)##/\\t}"
@@ -4341,34 +4318,39 @@ weather() {
return 1
}
+ local VERBOSE="yes" # TODO: Make this a command line switch
+
+ local ODIR=`pwd`
local PLACE="${1:u}"
- local FILE="$HOME/.weather/$PLACE"
- local LOG="$HOME/.weather/log"
+ local DIR="${HOME}/.weather"
+ local LOG="${DIR}/log"
- [[ -d $HOME/.weather ]] || {
- print -n "Creating $HOME/.weather: "
- mkdir $HOME/.weather
+ [[ -d ${DIR} ]] || {
+ print -n "Creating ${DIR}: "
+ mkdir ${DIR}
print 'done'
}
print "Retrieving information for ${PLACE}:"
print
- wget -T 10 --no-verbose --output-file=$LOG --output-document=$FILE --timestamping http://weather.noaa.gov/pub/data/observations/metar/decoded/$PLACE.TXT
+ cd ${DIR} && wget -T 10 --no-verbose --output-file=$LOG --timestamping http://weather.noaa.gov/pub/data/observations/metar/decoded/$PLACE.TXT
if [[ $? -eq 0 ]] ; then
if [[ -n "$VERBOSE" ]] ; then
- cat $FILE
+ cat ${PLACE}.TXT
else
- DATE=$(grep 'UTC' $FILE | sed 's#.* /##')
- TEMPERATURE=$(awk '/Temperature/ { print $4" degree Celcius / " $2" degree Fahrenheit" }' $FILE| tr -d '(')
+ DATE=$(grep 'UTC' ${PLACE}.TXT | sed 's#.* /##')
+ TEMPERATURE=$(awk '/Temperature/ { print $4" degree Celcius / " $2" degree Fahrenheit" }' ${PLACE}.TXT | tr -d '(')
echo "date: $DATE"
echo "temp: $TEMPERATURE"
fi
else
print "There was an error retrieving the weather information for $PLACE" >&2
cat $LOG
+ cd $ODIR
return 1
fi
+ cd $ODIR
}
# }}}
@@ -4398,57 +4380,8 @@ if check_com -c hg ; then
[[ -n "$1" ]] && hg diff -r $1 -r tip | diffstat || hg export tip | diffstat
}
- #f5# Get current mercurial tip via hg itself
- gethgclone() {
- emulate -L zsh
- setopt errreturn
- if [[ -f mercurial-tree/.hg ]] ; then
- cd mercurial-tree
- echo "Running hg pull for retreiving latest version..."
- hg pull
- echo "Finished update. Building mercurial"
- make local
- echo "Setting \$PATH to $PWD:\$PATH..."
- export PATH="$PWD:$PATH"
- else
- echo "Downloading mercurial via hg"
- hg clone http://selenic.com/repo/hg mercurial-tree
- cd mercurial-tree
- echo "Building mercurial"
- make local
- echo "Setting \$PATH to $PWD:\$PATH..."
- export PATH="$PWD:$PATH"
- echo "make sure you set it permanent via ~/.zshrc if you plan to use it permanently."
- # echo "Setting \$PYTHONPATH to PYTHONPATH=\${HOME}/lib/python,"
- # export PYTHONPATH=${HOME}/lib/python
- fi
- }
-
fi # end of check whether we have the 'hg'-executable
-# get current mercurial snapshot
-#f5# Get current mercurial snapshot
-gethgsnap() {
- emulate -L zsh
- setopt errreturn
- if [[ -f mercurial-snapshot.tar.gz ]] ; then
- echo "mercurial-snapshot.tar.gz exists already, skipping download."
- else
- echo "Downloading mercurial snapshot"
- wget http://www.selenic.com/mercurial/mercurial-snapshot.tar.gz
- fi
- echo "Unpacking mercurial-snapshot.tar.gz"
- tar zxf mercurial-snapshot.tar.gz
- cd mercurial-snapshot/
- echo "Installing required build-dependencies"
- $SUDO apt-get update
- $SUDO apt-get install python2.4-dev
- echo "Building mercurial"
- make local
- echo "Setting \$PATH to $PWD:\$PATH..."
- export PATH="$PWD:$PATH"
- echo "make sure you set it permanent via ~/.zshrc if you plan to use it permanently."
-}
# }}}
# some useful commands often hard to remember - let's grep for them {{{
@@ -4509,15 +4442,11 @@ if (( GRMLSMALL_SPECIFIC > 0 )) && isgrmlsmall ; then
unset abk[V]
unalias 'V' &> /dev/null
unfunction vman &> /dev/null
- unfunction vimpm &> /dev/null
- unfunction vimhelp &> /dev/null
unfunction viless &> /dev/null
unfunction 2html &> /dev/null
# manpages are not in grmlsmall
unfunction manzsh &> /dev/null
- unalias man2 &> /dev/null
- unalias man &> /dev/null
unfunction man2 &> /dev/null
fi
@@ -4538,3 +4467,6 @@ zrclocal
## END OF FILE #################################################################
# vim:filetype=zsh foldmethod=marker autoindent expandtab shiftwidth=4
+# Local variables:
+# mode: sh
+# End: