From 2550abc86968ff51ff7931aeebaf2980db428855 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Thu, 30 Nov 2006 17:15:40 +0100 Subject: [PATCH] * /etc/zsh/zshrc: - move function H-Glob to this file as well and make it available as help-zshglob as well, thanks for the translation to english - ft! * /etc/skel/.zshrc: - rework function dirspace() [support $1] - replace all '1>/dev/null 2>&1' with '&>/dev/null' --- debian/changelog | 8 +++++++- etc/skel/.zshrc | 51 ++++++--------------------------------------------- etc/zsh/zshrc | 46 +++++++++++++++++++++++++++++++++++++++++++++- 3 files changed, 58 insertions(+), 47 deletions(-) diff --git a/debian/changelog b/debian/changelog index bf4a002..2d63f8e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,14 +1,20 @@ grml-etc-core (0.2.2) unstable; urgency=low + Another "Frank 'ft' Terbeck is my zsh hero" release. + * Use new grml-repository by default now (thanks for the great work, formorer!). * /etc/zsh/zshrc: - move power completion / abbreviation expansion from /etc/skel/.zshrc to main zsh config file so we can use it as root as well (thanks for hint, wuehlmaus) + - move function H-Glob to this file as well and make it available + as help-zshglob as well, thanks for the translation to english - ft! - support setting of RPROMPT via $DONTSETRPROMPT (thanks ft!) - allow setting NOPRECMD=1 without starting new zsh (thanks, ft!) - * /etc/skel/.zshrc: rework function dirspace() [support $1] + * /etc/skel/.zshrc: + - rework function dirspace() [support $1] + - replace all '1>/dev/null 2>&1' with '&>/dev/null' -- Michael Prokop Wed, 29 Nov 2006 23:25:08 +0100 diff --git a/etc/skel/.zshrc b/etc/skel/.zshrc index ef1eb8e..0d4a52f 100644 --- a/etc/skel/.zshrc +++ b/etc/skel/.zshrc @@ -3,7 +3,7 @@ # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2. -# Latest change: Don Nov 30 16:15:10 CET 2006 [mika] +# Latest change: Don Nov 30 17:03:28 CET 2006 [mika] ################################################################################ # source ~/.zshrc.global {{{ @@ -120,7 +120,7 @@ alias conkeror='firefox -chrome chrome://conkeror/content' # arch/tla stuff - if type -p tla >/dev/null 2>&1 ; then + if type -p tla &>/dev/null ; then alias tdi='tla what-changed --diffs | less' alias tbp='tla-buildpackage' alias tmi='tla archive-mirror' @@ -206,7 +206,7 @@ wikien() { ${=BROWSER} http://en.wikipedia.org/wiki/"$*" } wodeb () { ${=BROWSER} "http://packages.debian.org/cgi-bin/search_contents.pl?word=$1&version=${2:-unstable}" } - which google >/dev/null 2>&1 && gex () { google "\"[ $1]\" $*" } # exact search at google + which google &>/dev/null && gex () { google "\"[ $1]\" $*" } # exact search at google # Function Usage: doc packagename doc() { cd /usr/share/doc/$1 && ls } @@ -285,45 +285,6 @@ cd ~$dir } -# provide useful information on globbing - H-Glob() { - echo -e " - / directories - . plain files - @ symbolic links - = sockets - p named pipes (FIFOs) - * executable plain files (0100) - % device files (character or block special) - %b block special files - %c character special files - r owner-readable files (0400) - w owner-writable files (0200) - x owner-executable files (0100) - A group-readable files (0040) - I group-writable files (0020) - E group-executable files (0010) - R world-readable files (0004) - W world-writable files (0002) - X world-executable files (0001) - s setuid files (04000) - S setgid files (02000) - t files with the sticky bit (01000) - print *(m-1) # Dateien, die vor bis zu einem Tag modifiziert wurden. - print *(a1) # Dateien, auf die vor einem Tag zugegriffen wurde. - print *(@) # Nur Links - print *(Lk+50) # Dateien die ueber 50 Kilobytes grosz sind - print *(Lk-50) # Dateien die kleiner als 50 Kilobytes sind - print **/*.c # Alle *.c - Dateien unterhalb von \$PWD - print **/*.c~file.c # Alle *.c - Dateien, aber nicht 'file.c' - print (foo|bar).* # Alle Dateien mit 'foo' und / oder 'bar' am Anfang - print *~*.* # Nur Dateien ohne '.' in Namen - chmod 644 *(.^x) # make all non-executable files publically readable - print -l *(.c|.h) # Nur Dateien mit dem Suffix '.c' und / oder '.h' - print **/*(g:users:) # Alle Dateien/Verzeichnisse der Gruppe >users< - echo /proc/*/cwd(:h:t:s/self//) # Analog zu >ps ax | awk '{print $1}'<" - } - # find out which libs define a symbol # usage example: 'lcheck strcpy' lcheck() { @@ -426,7 +387,7 @@ cl() { cd $1 && ls -a } # Use vim to convert plaintext to HTML - 2html() { vim -u NONE -n -c ':syntax on' -c ':so $VIMRUNTIME/syntax/2html.vim' -c ':wqa' $1 > /dev/null 2> /dev/null } + 2html() { vim -u NONE -n -c ':syntax on' -c ':so $VIMRUNTIME/syntax/2html.vim' -c ':wqa' $1 &>/dev/null } # Usage: simple-extract # Description: extracts archived files (maybe) @@ -837,7 +798,7 @@ # }}} # mercurial related stuff {{{ - if type -p hg >/dev/null 2>&1 ; then + if type -p hg &>/dev/null ; then # gnu like diff for mercurial # http://www.selenic.com/mercurial/wiki/index.cgi/TipsAndTricks hgdi() { @@ -879,7 +840,7 @@ # export PYTHONPATH=${HOME}/lib/python fi } - + fi # end of check whether we have the 'hg'-executable # get current mercurial snapshot diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index e47b106..8e88d41 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -869,9 +869,53 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." for i in Start Restart Stop Force-Reload Reload ; do eval "$i() { $SUDO /etc/init.d/\$1 ${i:l} \$2 ; }" done -# now the completion for this: + # now the completion for this: compctl -g "$(echo /etc/init.d/*(:t))" Start Restart Stop Force-Reload Reload fi + +# provide useful information on globbing + H-Glob() { + echo -e " + / directories + . plain files + @ symbolic links + = sockets + p named pipes (FIFOs) + * executable plain files (0100) + % device files (character or block special) + %b block special files + %c character special files + r owner-readable files (0400) + w owner-writable files (0200) + x owner-executable files (0100) + A group-readable files (0040) + I group-writable files (0020) + E group-executable files (0010) + R world-readable files (0004) + W world-writable files (0002) + X world-executable files (0001) + s setuid files (04000) + S setgid files (02000) + t files with the sticky bit (01000) + + print *(m-1) # Files modified up to a day ago + print *(a1) # Files accessed a day ago + print *(@) # Just symlinks + print *(Lk+50) # Files bigger than 50 kilobytes + print *(Lk-50) # Files smaller than 50 kilobytes + print **/*.c # All *.c files recursively starting in \$PWD + print **/*.c~file.c # Same as above, but excluding 'file.c' + print (foo|bar).* # Files starting with 'foo' or 'bar' + print *~*.* # All Files that do not contain a dot + chmod 644 *(.^x) # make all plain non-executable files publically readable + print -l *(.c|.h) # Lists *.c and *.h + print **/*(g:users:) # Recursively match all files that are owned by group 'users' + echo /proc/*/cwd(:h:t:s/self//) # Analogous to >ps ax | awk '{print $1}'<" + } + alias help-zshglob=H-Glob + + type -p fma &>/dev/null && alias ?='fma zshall' + # }}} # {{{ make sure our environment is clean regarding colors -- 2.1.4