From 8bdf3e57fdc82885826b23f7cd8c905b6331feb5 Mon Sep 17 00:00:00 2001 From: Michael Prokop Date: Mon, 3 Dec 2007 23:00:48 +0100 Subject: [PATCH] Apply patch by z3ttacht regarding issue354 --- debian/changelog | 9 +-- etc/skel/.zshrc | 114 +++++++++++++++++++------------------- etc/zsh/zshenv | 22 ++++---- etc/zsh/zshrc | 166 +++++++++++++++++++++++++++---------------------------- 4 files changed, 156 insertions(+), 155 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1f03fe4..a0b543f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,11 @@ grml-etc-core (0.3.41) unstable; urgency=low - * /etc/zsh/zshrc: - - replace $(which ...) with $(type ...) - * /etc/skel/.zshrc: + * /etc/zsh/zshrc and /etc/skel/.zshrc: - replace $(which ...) with $(type ...) - - add alias 'g' for git. + - add alias 'g' for git + - standarized the use of brackets - double instead of single ones - + for test situations like if-clauses. Thanks for the patch, + Alexander Steinböck! [Testing: issue354] -- Michael Prokop Sun, 02 Dec 2007 19:54:45 +0100 diff --git a/etc/skel/.zshrc b/etc/skel/.zshrc index 75cacc2..134faf7 100644 --- a/etc/skel/.zshrc +++ b/etc/skel/.zshrc @@ -10,13 +10,13 @@ # see /etc/zsh/zshrc for some general settings # If you don't have write permissions to /etc/zsh/zshrc on your own # copy the file to your $HOME as /.zshrc.global and we source it: - if [ -r ~/.zshrc.global ] ; then + if [[ -r ~/.zshrc.global ]] ; then . ~/.zshrc.global fi # }}} # check whether global file has been read {{{ - if [ -z "$ZSHRC_GLOBAL_HAS_BEEN_READ" ] ; then + if [[ -z "$ZSHRC_GLOBAL_HAS_BEEN_READ" ]] ; then print 'Warning: global zsh config has not been read'>&2 fi # }}} @@ -45,13 +45,13 @@ export COLORTERM="yes" # set default browser - if [ -z "$BROWSER" ] ; then - if [ -n "$DISPLAY" ] ; then + if [[ -z "$BROWSER" ]] ; then + if [[ -n "$DISPLAY" ]] ; then #v# If X11 is running - [ -x $(type firefox) ] && export BROWSER=firefox + [[ -x $(type firefox) ]] && export BROWSER=firefox else #v# If no X11 is running - [ -x $(type w3m) ] && export BROWSER=w3m + [[ -x $(type w3m) ]] && export BROWSER=w3m fi fi #v# @@ -59,12 +59,12 @@ # export qtdir #m# v QTDIR \kbd{/usr/share/qt[34]}\quad [for non-root only] - [ -d /usr/share/qt3 ] && export QTDIR=/usr/share/qt3 - [ -d /usr/share/qt4 ] && export QTDIR=/usr/share/qt4 + [[ -d /usr/share/qt3 ]] && export QTDIR=/usr/share/qt3 + [[ -d /usr/share/qt4 ]] && export QTDIR=/usr/share/qt4 # support running 'jikes *.java && jamvm HelloWorld' OOTB: #v# [for non-root only] - [ -f /usr/share/classpath/glibj.zip ] && export JIKESPATH=/usr/share/classpath/glibj.zip + [[ -f /usr/share/classpath/glibj.zip ]] && export JIKESPATH=/usr/share/classpath/glibj.zip # }}} ## set options {{{ @@ -120,7 +120,7 @@ alias huge='echo -en "\033]50;-misc-fixed-medium-r-normal-*-*-210-*-*-c-*-iso8859-15\007"' alias smartfont='echo -en "\033]50;-artwiz-smoothansi-*-*-*-*-*-*-*-*-*-*-*-*\007"' alias semifont='echo -en "\033]50;-misc-fixed-medium-r-semicondensed-*-*-120-*-*-*-*-iso8859-15\007"' -# if [ "$TERM" = "xterm" ] && [ "$LINES" -ge 50 ] && [ "$COLUMNS" -ge 100 ] && [ -z "$SSH_CONNECTION" ]; then +# if [[ "$TERM" = "xterm" ]] && [[ "$LINES" -ge 50 ]] && [[ "$COLUMNS" -ge 100 ]] && [[ -z "$SSH_CONNECTION" ]] ; then # large # fi @@ -197,7 +197,7 @@ #a2# Execute \kbd{mkdir -o} alias md='mkdir -p' - [ -x $(type ipython) ] && alias ips='ipython -p sh' + [[ -x $(type ipython) ]] && alias ips='ipython -p sh' # console stuff #a2# Execute \kbd{mplayer -vo fbdev} @@ -217,8 +217,8 @@ type g &>/dev/null || alias g='git' # use colors when browsing man pages, but only if not using LESS_TERMCAP_* from /etc/zsh/zshenv: - if [ -z "$LESS_TERMCAP_md" ] ; then - [ -d ~/.terminfo/ ] && alias man='TERMINFO=~/.terminfo/ LESS=C TERM=mostlike PAGER=less man' + if [[ -z "$LESS_TERMCAP_md" ]] ; then + [[ -d ~/.terminfo/ ]] && alias man='TERMINFO=~/.terminfo/ LESS=C TERM=mostlike PAGER=less man' fi # check whether Debian's package management (dpkg) is running @@ -229,16 +229,16 @@ # work around non utf8 capable software in utf environment via $LANG and luit if type isutfenv &>/dev/null && type luit &>/dev/null; then - if [ -x $(type mrxvt) ] ; then - isutfenv && [ -n "$LANG" ] && alias mrxvt="LANG=${LANG/(#b)(*)[.@]*/$match[1].iso885915} luit mrxvt" + if [[ -x $(type mrxvt) ]] ; then + isutfenv && [[ -n "$LANG" ]] && alias mrxvt="LANG=${LANG/(#b)(*)[.@]*/$match[1].iso885915} luit mrxvt" fi - if [ -x $(type aterm) ] ; then - isutfenv && [ -n "$LANG" ] && alias aterm="LANG=${LANG/(#b)(*)[.@]*/$match[1].iso885915} luit aterm" + if [[ -x $(type aterm) ] ; then + isutfenv && [[ -n "$LANG" ]] && alias aterm="LANG=${LANG/(#b)(*)[.@]*/$match[1].iso885915} luit aterm" fi - if [ -x $(type centericq) ] ; then - isutfenv && [ -n "$LANG" ] && alias centericq="LANG=${LANG/(#b)(*)[.@]*/$match[1].iso885915} luit centericq" + if [[ -x $(type centericq) ]] ; then + isutfenv && [[ -n "$LANG" ]] && alias centericq="LANG=${LANG/(#b)(*)[.@]*/$match[1].iso885915} luit centericq" fi fi # }}} @@ -324,7 +324,7 @@ # download video from youtube ytdl() { - if ! [ -n "$2" ] ; then + if ! [[ -n "$2" ]] ; then print "Usage: ydtl http://youtube.com/watch?v=.... outputfile.flv">&2 return 1 else @@ -386,7 +386,7 @@ alias GREP='grep -i --color=auto' # one blank line between each line - if [ -r ~/.terminfo/m/mostlike ] ; then + if [[ -r ~/.terminfo/m/mostlike ]] ; then # alias man2='MANPAGER="sed -e G |less" TERMINFO=~/.terminfo TERM=mostlike /usr/bin/man' #f5# Watch manpages in a stretched style man2() { PAGER='dash -c "sed G | /usr/bin/less"' TERM=mostlike /usr/bin/man "$@" ; } @@ -419,7 +419,7 @@ # usage example: 'lcheck strcpy' #f5# Find out which libs define a symbol lcheck() { - if [ -n "$1" ] ; then + if [[ -n "$1" ]] ; then nm -go /usr/lib/lib*.a 2>/dev/null | grep ":[[:xdigit:]]\{8\} . .*$1" else echo "Usage: lcheck " >&2 @@ -430,7 +430,7 @@ purge() { FILES=(*~(N) .*~(N) \#*\#(N) *.o(N) a.out(N) *.core(N) *.cmo(N) *.cmi(N) .*.swp(N)) NBFILES=${#FILES} - if [[ $NBFILES > 0 ]]; then + if [[ $NBFILES > 0 ]] ; then print $FILES local ans echo -n "Remove these files? [y/n] " @@ -545,7 +545,7 @@ # Usage: smartcompress () #f5# Smart archive creator smartcompress() { - if [ $2 ]; then + if [[ $2 ]] ; then case $2 in tgz | tar.gz) tar -zcvf$1.$2 $1 ;; tbz2 | tar.bz2) tar -jcvf$1.$2 $1 ;; @@ -582,13 +582,13 @@ #f5# Follow symlinks folsym() { - if [[ -e $1 || -h $1 ]]; then + if [[ -e $1 || -h $1 ]] ; then file=$1 else file=`which $1` fi - if [[ -e $file || -L $file ]]; then - if [[ -L $file ]]; then + if [[ -e $file || -L $file ]] ; then + if [[ -L $file ]] ; then echo `ls -ld $file | perl -ane 'print $F[7]'` '->' folsym `perl -le '$file = $ARGV[0]; $dest = readlink $file; @@ -654,9 +654,9 @@ # stolen and modified from Sven's zshrc.forall #f5# Report diskusage of a directory dirspace() { - if [ -n "$1" ] ; then + if [[ -n "$1" ]] ; then for dir in $* ; do - if [ -d "$dir" ] ; then + if [[ -d "$dir" ]] ; then ( cd $dir; echo "-<$dir>"; du -shx .; echo); else echo "warning: $dir does not exist" >&2 @@ -664,7 +664,7 @@ done else for dir in $path; do - if [ -d "$dir" ] ; then + if [[ -d "$dir" ]] ; then ( cd $dir; echo "-<$dir>"; du -shx .; echo); else echo "warning: $dir does not exist" >&2 @@ -709,7 +709,7 @@ echo " * Would you like to burn the cd now? (yes/no)" read input if - [ "$input" = "yes" ]; then + [[ "$input" = "yes" ]] ; then echo " ! Burning Audio CD" audioburn echo " * done." @@ -725,7 +725,7 @@ cdrdao write --device $DEVICE --driver generic-mmc audiocd.toc echo " * Should I remove the temporary files? (yes/no)" read input - if [ "$input" = "yes" ]; then + if [[ "$input" = "yes" ]] ; then echo " ! Removing Temporary Files." cd ~ rm -rf ~/ripps @@ -802,7 +802,7 @@ getxlite() { setopt local_options setopt errreturn - [ -d ~/tmp ] || mkdir ~/tmp + [[ -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 @@ -810,7 +810,7 @@ else echo "Error while downloading." ; return 1 fi - if [ -x xten-xlite/xtensoftphone ] ; then + if [[ -x xten-xlite/xtensoftphone ]] ; then echo "Execute xten-xlite/xtensoftphone to start xlite." fi } @@ -849,21 +849,21 @@ getair() { setopt local_options setopt errreturn - [ -w . ] || { echo 'Error: you do not have write permissions in this directory. Exiting.' ; return 1 } + [[ -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 + [[ -x /usr/local/bin/air ]] && [[ -n "$DISPLAY" ]] && $SUDO air } #f5# Get specific git commitdiff git-get-diff() { - if [ -z $GITTREE ] ; then + if [[ -z $GITTREE ]] ; then GITTREE='linux/kernel/git/torvalds/linux-2.6.git' fi - if ! [ -z $1 ] ; then + if ! [[ -z $1 ]] ; then ${=BROWSER} "http://kernel.org/git/?p=$GITTREE;a=commitdiff;h=$1" else echo "Usage: git-get-diff " @@ -872,10 +872,10 @@ #f5# Get specific git commit git-get-commit() { - if [ -z $GITTREE ] ; then + if [[ -z $GITTREE ]] ; then GITTREE='linux/kernel/git/torvalds/linux-2.6.git' fi - if ! [ -z $1 ] ; then + if ! [[ -z $1 ]] ; then ${=BROWSER} "http://kernel.org/git/?p=$GITTREE;a=commit;h=$1" else echo "Usage: git-get-commit " @@ -884,10 +884,10 @@ #f5# Get specific git diff git-get-plaindiff() { - if [ -z $GITTREE ] ; then + if [[ -z $GITTREE ]] ; then GITTREE='linux/kernel/git/torvalds/linux-2.6.git' fi - if ! [ -z $1 ] ; then + if ! [[ -z $1 ]] ; then wget "http://kernel.org/git/?p=$GITTREE;a=commitdiff_plain;h=$1" -O $1.diff else echo 'Usage: git-get-plaindiff ' @@ -908,13 +908,13 @@ # highlight important stuff in diff output, usage example: hg diff | hidiff #m# a2 hidiff \kbd{histring} oneliner for diffs - [ -x $(type histring) ] && \ + [[ -x $(type histring) ]] && \ alias hidiff="histring -fE '^Comparing files .*|^diff .*' | histring -c yellow -fE '^\-.*' | histring -c green -fE '^\+.*'" # rename pictures based on information found in exif headers #f5# Rename pictures based on information found in exif headers exirename() { - if [ $# -lt 1 ] ; then + if [[ $# -lt 1 ]] ; then echo 'Usage: jpgrename $FILES' >& 2 return 1 else @@ -941,7 +941,7 @@ # get_ic() - queries imap servers for capabilities; real simple. no imaps ic_get() { local port - if [[ ! -z $1 ]]; then + if [[ ! -z $1 ]] ; then port=${2:-143} print "querying imap server on $1:${port}...\n"; print "a1 capability\na2 logout\n" | nc $1 ${port} @@ -977,7 +977,7 @@ # hl() highlighted less # http://ft.bewatermyfriend.org/comp/data/zsh/zfunct.html - if [ -x $(type highlight) ] ; then + if [[ -x $(type highlight) ]] ; then function hl() { local theme lang theme=${HL_THEME:-""} @@ -1049,8 +1049,8 @@ # change fluxbox keys from 'Alt-#' to 'Alt-F#' and vice versa fluxkey-change() { - [ -n "$FLUXKEYS" ] || local FLUXKEYS="$HOME/.fluxbox/keys" - if ! [ -r "$FLUXKEYS" ] ; then + [[ -n "$FLUXKEYS" ]] || local FLUXKEYS="$HOME/.fluxbox/keys" + if ! [[ -r "$FLUXKEYS" ]] ; then echo "Sorry, \$FLUXKEYS file $FLUXKEYS could not be read - nothing to be done." return 1 else @@ -1070,7 +1070,7 @@ # retrieve weather information on the console # Usage example: 'weather LOWG' weather () { - [ -n "$1" ] || { + [[ -n "$1" ]] || { print 'Usage: weather ' >&2 return 1 } @@ -1079,7 +1079,7 @@ local FILE="$HOME/.weather/$PLACE" local LOG="$HOME/.weather/log" - [ -d $HOME/.weather ] || { + [[ -d $HOME/.weather ]] || { print -n "Creating $HOME/.weather: " mkdir $HOME/.weather print 'done' @@ -1090,7 +1090,7 @@ wget -T 10 --no-verbose --output-file=$LOG --output-document=$FILE --timestamping http://weather.noaa.gov/pub/data/observations/metar/decoded/$PLACE.TXT if [[ $? = 0 ]] ; then - if [ -n "$VERBOSE" ] ; then + if [[ -n "$VERBOSE" ]] ; then cat $FILE else DATE=$(grep 'UTC' $FILE | sed 's#.* /##') @@ -1129,7 +1129,7 @@ # hgstat 1234 => display diffstat between revision 1234 and tip #f5# Diffstat for specific version of a mercurial repos hgstat() { - [ -n "$1" ] && hg diff -r $1 -r tip | diffstat || hg export tip | diffstat + [[ -n "$1" ]] && hg diff -r $1 -r tip | diffstat || hg export tip | diffstat } # get current mercurial tip via hg itself @@ -1137,7 +1137,7 @@ gethgclone() { setopt local_options setopt errreturn - if [ -f mercurial-tree/.hg ] ; then + if [[ -f mercurial-tree/.hg ]] ; then cd mercurial-tree echo "Running hg pull for retreiving latest version..." hg pull @@ -1166,7 +1166,7 @@ gethgsnap() { setopt local_options setopt errreturn - if [ -f mercurial-snapshot.tar.gz ] ; then + if [[ -f mercurial-snapshot.tar.gz ]] ; then echo "mercurial-snapshot.tar.gz exists already, skipping download." else echo "Downloading mercurial snapshot" @@ -1189,8 +1189,8 @@ # some useful commands often hard to remember - let's grep for them {{{ # Work around ion/xterm resize bug. -#if [ "$SHLVL" = 1 ]; then -# if [ -x $(type resize) ]; then +#if [[ "$SHLVL" = 1 ]]; then +# if [[ -x $(type resize) ]]; then # eval `resize autologin # Thanks go to Bart Schaefer! isgrml && checkhome() { - if [[ -z "$ALREADY_DID_CD_HOME" ]]; then + if [[ -z "$ALREADY_DID_CD_HOME" ]] ; then export ALREADY_DID_CD_HOME=$HOME cd fi @@ -244,7 +244,7 @@ export SHELL='/bin/zsh' # color setup for ls: - [ -x $(type dircolors) ] && eval `dircolors -b` + [[ -x $(type dircolors) ]] && eval `dircolors -b` # set width of man pages to 80 for more convenient reading # (( ${+MANWIDTH} )) || export MANWIDTH=80 @@ -255,7 +255,7 @@ # completion functions go to /etc/zsh/completion.d # function files may be put into /etc/zsh/functions.d, from where they # will be automatically autoloaded. - if [ -n "$BROKEN_COMPLETION_DIR" ] ; then + if [[ -n "$BROKEN_COMPLETION_DIR" ]] ; then print 'Warning: not setting completion directories because broken files have been found.'>&2 else [[ -d /etc/zsh/completion.d ]] && fpath+=( /etc/zsh/completion.d ) @@ -272,7 +272,7 @@ # }}} # {{{ keybindings - if [[ "$TERM" != emacs ]]; then + if [[ "$TERM" != emacs ]] ; then [[ -z "$terminfo[kdch1]" ]] || bindkey -M emacs "$terminfo[kdch1]" delete-char [[ -z "$terminfo[khome]" ]] || bindkey -M emacs "$terminfo[khome]" beginning-of-line [[ -z "$terminfo[kend]" ]] || bindkey -M emacs "$terminfo[kend]" end-of-line @@ -302,7 +302,7 @@ fi # use vi style: # bindkey -v -#if [[ "$TERM" == screen ]]; then +#if [[ "$TERM" == screen ]] ; then bindkey '\e[1~' beginning-of-line # home bindkey '\e[4~' end-of-line # end bindkey '\e[A' up-line-or-search # cursor up @@ -325,7 +325,7 @@ fi # just type 'cd ...' to get 'cd ../..' # rationalise-dot() { -# if [[ $LBUFFER = *.. ]]; then +# if [[ $LBUFFER = *.. ]] ; then # LBUFFER+=/.. # else # LBUFFER+=. @@ -621,7 +621,7 @@ fi # dirstack handling {{{ DIRSTACKSIZE=20 - if [[ -f ~/.zdirs ]] && [[ ${#dirstack[*]} -eq 0 ]]; then + if [[ -f ~/.zdirs ]] && [[ ${#dirstack[*]} -eq 0 ]] ; then dirstack=( ${(f)"$(< ~/.zdirs)"} ) # "cd -" won't work after login by just setting $OLDPWD, so [[ -d $dirstack[0] ]] && cd $dirstack[0] && cd $OLDPWD @@ -632,11 +632,11 @@ fi # }}} # {{{ display battery status on right side of prompt via running 'BATTERY=1 zsh' - if [ -n "$BATTERY" ] ; then - if [ -x $(type acpi) ] ; then + if [[ -n "$BATTERY" ]] ; then + if [[ -x $(type acpi) ]] ; then PERCENT="${(C)${(s| |)$(acpi 2>/dev/null)}[4]}" - [ -z "$PERCENT" ] && PERCENT='acpi not present' - if [ "${PERCENT%%%}" -lt 20 ] ; then + [[ -z "$PERCENT" ]] && PERCENT='acpi not present' + if [[ "${PERCENT%%%}" -lt 20 ]] ; then PERCENT="warning: ${PERCENT}%" fi fi @@ -665,9 +665,9 @@ fi } svn_dir() { - [ -d ".svn" ] || return 1 + [[ -d ".svn" ]] || return 1 base_dir="." - while [ -d "$base_dir/../.svn" ]; do base_dir="$base_dir/.."; done + while [[ -d "$base_dir/../.svn" ]]; do base_dir="$base_dir/.."; done base_dir=$(readlink -f "$base_dir") sub_dir=$(sub_dir "${base_dir}") ref=$(svn info "$base_dir" | awk '/^URL/ { sub(".*/","",$0); r=$0 } /^Revision/ { sub("[^0-9]*","",$0); print r":"$0 }') @@ -675,7 +675,7 @@ fi } svk_dir() { - [ -f ~/.svk/config ] || return 1 + [[ -f ~/.svk/config ]] || return 1 base_dir=$(awk '/: *$/ { sub(/^ */,"",$0); sub(/: *$/,"",$0); if (match("'${PWD}'", $0"(/|$)")) { print $0; d=1; } } /depotpath/ && d == 1 { sub(".*/","",$0); r=$0 } /revision/ && d == 1 { print r ":" $2; exit 1 }' ~/.svk/config) && return 1 ref=${base_dir##* } @@ -687,7 +687,7 @@ fi hg_dir() { base_dir="." - while [ ! -d "$base_dir/.hg" ]; do base_dir="$base_dir/.."; [ $(readlink -f "${base_dir}") = "/" ] && return 1; done + while [[ ! -d "$base_dir/.hg" ]]; do base_dir="$base_dir/.."; [[ $(readlink -f "${base_dir}") = "/" ]] && return 1; done base_dir=$(readlink -f "$base_dir") sub_dir=$(sub_dir "${base_dir}") ref=$(< "${base_dir}/.hg/branch") @@ -759,13 +759,13 @@ fi fi # get the name of the program currently running and hostname of local machine # set screen window title if running in a screen - if [[ "$TERM" == screen* ]]; then + 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\\" fi # set the screen title to "zsh" when sitting at the command prompt: - if [[ "$TERM" == screen* ]]; then + if [[ "$TERM" == screen* ]] ; then SCREENTITLE=$'%{\ekzsh\e\\%}' else SCREENTITLE='' @@ -800,7 +800,7 @@ fi PS4='+%N:%i:%_> ' # the execution trace prompt (setopt xtrace). default: '+%N:%i>' # set variable debian_chroot if running in a chroot with /etc/debian_chroot - if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then + if [[ -z "$debian_chroot" ]] && [[ -r /etc/debian_chroot ]] ; then debian_chroot=$(cat /etc/debian_chroot) fi @@ -810,7 +810,7 @@ fi 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 [[ -n $GRMLPROMPT ]]; then + if [[ -n $GRMLPROMPT ]] ; then PROMPT="${RED}${EXITCODE}${CYAN}[%j running job(s)] ${GREEN}{history#%!} ${RED}%(3L.+.) ${BLUE}%* %D ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# " else @@ -823,7 +823,7 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# " fi # if we are inside a grml-chroot set a specific prompt theme - if [ -n "$GRML_CHROOT" ] ; then + if [[ -n "$GRML_CHROOT" ]] ; then PROMPT="%{$fg[red]%}(CHROOT) %{$fg_bold[red]%}%n%{$fg_no_bold[white]%}@%m %40<...<%B%~%b%<< %\# " fi # }}} @@ -843,16 +843,16 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# " # }}} # {{{ some aliases - if [ $UID = 0 ] ; then - [ -r /etc/grml/screenrc ] && alias screen='/usr/bin/screen -c /etc/grml/screenrc' - elif [ -r $HOME/.screenrc ] ; then + if [[ $UID = 0 ]] ; then + [[ -r /etc/grml/screenrc ]] && alias screen='/usr/bin/screen -c /etc/grml/screenrc' + elif [[ -r $HOME/.screenrc ]] ; then alias screen="/usr/bin/screen -c $HOME/.screenrc" else - [ -r /etc/grml/screenrc_grml ] && alias screen='/usr/bin/screen -c /etc/grml/screenrc_grml' + [[ -r /etc/grml/screenrc_grml ]] && alias screen='/usr/bin/screen -c /etc/grml/screenrc_grml' fi # do we have GNU ls with color-support? - if ls --help 2>/dev/null |grep -- --color= >/dev/null && [ "$TERM" != dumb ] ; then + if ls --help 2>/dev/null |grep -- --color= >/dev/null && [[ "$TERM" != dumb ]] ; then #a1# execute \kbd{@a@}:\quad ls with colors alias ls='ls -b -CF --color=auto' #a1# execute \kbd{@a@}:\quad list all files, with colors @@ -875,7 +875,7 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# " alias ...='cd ../../' # generate alias named "$KERNELVERSION-reboot" so you can use boot with kexec: - if [ -x /sbin/kexec -a -r /proc/cmdline ] ; then + if [[ -x /sbin/kexec -a -r /proc/cmdline ]] ; then alias "$(uname -r)-reboot"="kexec -l --initrd=/boot/initrd.img-"$(uname -r)" --command-line=\"$(cat /proc/cmdline)\" /boot/vmlinuz-"$(uname -r)"" fi @@ -916,7 +916,7 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# " # set up software synthesizer via speakup alias swspeak=' aumix -w 90 -v 90 -p 90 -m 90 - if ! [ -r /dev/softsynth ] ; then + if ! [[ -r /dev/softsynth ]] ; then flite -o play -t "Sorry, software synthesizer not available. Did you boot with swspeak bootoption?" return 1 else @@ -940,7 +940,7 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# " 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 [ -x $(type truecrypt) ] ; then + if [[ -x $(type truecrypt) ]] ; then if isutfenv ; then alias truec='truecrypt --mount-options "rw,sync,dirsync,users,uid=1000,gid=users,umask=077,utf8" ' else @@ -999,7 +999,7 @@ Enjoy your grml system with the zsh!$reset_color" } # debian stuff - if [ -r /etc/debian_version ] ; then + if [[ -r /etc/debian_version ]] ; then #a3# Execute \kbd{apt-cache search} alias acs='apt-cache search' #a3# Execute \kbd{apt-cache show} @@ -1026,7 +1026,7 @@ Enjoy your grml system with the zsh!$reset_color" # debian upgrade #f3# Execute \kbd{apt-get update \&\& }\\&\quad \kbd{apt-get dist-upgrade} upgrade () { - if [ -z "$1" ] ; then + if [[ -z "$1" ]] ; then $SUDO apt-get update $SUDO apt-get -u upgrade else @@ -1052,14 +1052,14 @@ Enjoy your grml system with the zsh!$reset_color" fi # sort installed Debian-packages by size - if [ -x $(type grep-status) ] ; then + if [[ -x $(type grep-status) ]] ; then #a3# List installed Debian-packages sorted by size alias debs-by-size='grep-status -FStatus -sInstalled-Size,Package -n "install ok installed" | paste -sd " \n" | sort -rn' fi # if cdrecord is a symlink (to wodim) or isn't present at all warn: - if [ -L /usr/bin/cdrecord -o ! -x $(type cdrecord) ] ; then - if [ -x $(type wodim) ] ; then + if [[ -L /usr/bin/cdrecord -o ! -x $(type cdrecord) ]] ; then + if [[ -x $(type wodim) ]] ; then alias cdrecord="echo 'cdrecord is not provided under its original name by Debian anymore. See #377109 in the BTS of Debian for more details. @@ -1068,7 +1068,7 @@ Please use the wodim binary instead' ; return 1" fi # get_tw_cli has been renamed into get_3ware - if [ -x $(type get_3ware) ] ; then + if [[ -x $(type get_3ware) ]] ; then get_tw_cli() { echo 'Warning: get_tw_cli has been renamed into get_3ware. Invoking get_3ware for you.'>&2 get_3ware @@ -1076,7 +1076,7 @@ Please use the wodim binary instead' ; return 1" fi # I hate lacking backward compatibility, so provide an alternative therefore - if ! [ -x $(type apache2-ssl-certificate) ] ; then + if ! [[ -x $(type apache2-ssl-certificate) ]] ; then apache2-ssl-certificate(){ print 'Debian does not ship apache2-ssl-certificate anymore (see #398520). :(' @@ -1161,11 +1161,11 @@ grmlcomp() { # zstyle ':completion:*' completer _oldlist _expand _force_rehash _complete _ignored _correct _approximate _files setopt correct # try to correct the spelling if possible zstyle -e ':completion:*' completer ' - if [[ $_last_try != "$HISTNO$BUFFER$CURSOR" ]]; then + if [[ $_last_try != "$HISTNO$BUFFER$CURSOR" ]] ; then _last_try="$HISTNO$BUFFER$CURSOR" reply=(_complete _match _ignored _prefix _files) else - if [[ $words[1] = (rm|mv) ]]; then + if [[ $words[1] = (rm|mv) ]] ; then reply=(_complete _files) else reply=(_oldlist _expand _force_rehash _complete _ignored _correct _approximate _files) @@ -1190,13 +1190,13 @@ grmlcomp() { zstyle ':completion:*:urls' local 'www' '/var/www/' 'public_html' # caching - [ -d $ZSHDIR/cache ] && zstyle ':completion:*' use-cache yes && \ + [[ -d $ZSHDIR/cache ]] && zstyle ':completion:*' use-cache yes && \ zstyle ':completion::complete:*' cache-path $ZSHDIR/cache/ # host completion /* add brackets as vim can't parse zsh's complex cmdlines 8-) {{{ */ if is42 ; then - [ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=() - [ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(\n' "$0" && return 1 + [[ -z "$1" ]] && printf 'Usage: %s \n' "$0" && return 1 for i in "$@" ; do file=$i - while [ -h "$file" ] ; do + while [[ -h "$file" ]] ; do ls -l $file file=$(readlink "$file") done @@ -1352,12 +1352,12 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." # manzsh() { man zshall | $MYLESS -p $1 ; } fi - if [ -x $(type most) ] ; then + if [[ -x $(type most) ]] ; then #f1# View Debian's changelog of a given package dchange() { - if [ -r /usr/share/doc/${1}/changelog.Debian.gz ] ; then + if [[ -r /usr/share/doc/${1}/changelog.Debian.gz ]] ; then most /usr/share/doc/${1}/changelog.Debian.gz - elif [ -r /usr/share/doc/${1}/changelog.gz ] ; then + elif [[ -r /usr/share/doc/${1}/changelog.gz ]] ; then most /usr/share/doc/${1}/changelog.gz else if type -p aptitude &>/dev/null ; then @@ -1378,10 +1378,10 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." #f1# View Debian's NEWS of a given package dnews() { - if [ -r /usr/share/doc/${1}/NEWS.Debian.gz ] ; then + if [[ -r /usr/share/doc/${1}/NEWS.Debian.gz ]] ; then most /usr/share/doc/${1}/NEWS.Debian.gz else - if [ -r /usr/share/doc/${1}/NEWS.gz ] ; then + if [[ -r /usr/share/doc/${1}/NEWS.gz ]] ; then most /usr/share/doc/${1}/NEWS.gz else echo "No NEWS file for package $1 found, sorry." @@ -1394,7 +1394,7 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." #f1# View upstream's changelog of a given package uchange() { - if [ -r /usr/share/doc/${1}/changelog.gz ] ; then + if [[ -r /usr/share/doc/${1}/changelog.gz ]] ; then most /usr/share/doc/${1}/changelog.gz else echo "No changelog for package $1 found, sorry." @@ -1412,13 +1412,13 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." #f1# Edit an alias via zle edalias() { - [ -z "$1" ] && { echo "Usage: edalias " ; return 1 } || vared aliases'[$1]' ; + [[ -z "$1" ]] && { echo "Usage: edalias " ; return 1 } || vared aliases'[$1]' ; } compdef _aliases edalias #f1# Edit a function via zle edfunc() { - [ -z "$1" ] && { echo "Usage: edfun " ; return 1 } || zed -f "$1" ; + [[ -z "$1" ]] && { echo "Usage: edfun " ; return 1 } || zed -f "$1" ; } compdef _functions edfunc @@ -1428,7 +1428,7 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." #m# f6 Stop() \kbd{/etc/init.d/\em{process}}\quad\kbd{stop} #m# f6 Reload() \kbd{/etc/init.d/\em{process}}\quad\kbd{reload} #m# f6 Force-Reload() \kbd{/etc/init.d/\em{process}}\quad\kbd{force-reload} - if [ -d /etc/init.d ] ; then + if [[ -d /etc/init.d ]] ; then for i in Start Restart Stop Force-Reload Reload ; do eval "$i() { $SUDO /etc/init.d/\$1 ${i:l} \$2 ; }" done @@ -1479,7 +1479,7 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." # grep for running process, like: 'any vim' any() { - if [ -z "$1" ] ; then + if [[ -z "$1" ]] ; then echo "any - grep for process(es) by keyword" >&2 echo "Usage: any " >&2 ; return 1 else @@ -1493,7 +1493,7 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." # 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 ] && deswap() { + [[ -r /proc/1/maps ]] && deswap() { print 'Reading /proc/[0-9]*/maps and sending output to /dev/null, this might take a while.' cat $(sed -ne 's:.* /:/:p' /proc/[0-9]*/maps | sort -u | grep -v '^/dev/') > /dev/null print 'Finished, running "swapoff -a; swapon -a" may also be useful.' @@ -1501,13 +1501,13 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." # print hex value of a number hex() { - [ -n "$1" ] && printf "%x\n" $1 || { print 'Usage: hex ' ; return 1 } + [[ -n "$1" ]] && printf "%x\n" $1 || { print 'Usage: hex ' ; return 1 } } # calculate (or eval at all ;-)) with perl => p[erl-]eval # hint: also take a look at zcalc -> 'autoload zcalc' -> 'man zshmodules | less -p MATHFUNC' peval() { - [ -n "$1" ] && CALC="$*" || print "Usage: calc [expression]" + [[ -n "$1" ]] && CALC="$*" || print "Usage: calc [expression]" perl -e "print eval($CALC),\"\n\";" } functions peval &>/dev/null && alias calc=peval @@ -1515,7 +1515,7 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." # brltty seems to have problems with utf8 environment and/or font Uni3-Terminus16 under # certain circumstances, so work around it, no matter which environment we have brltty() { - if [ -z "$DISPLAY" ] ; then + if [[ -z "$DISPLAY" ]] ; then consolechars -f /usr/share/consolefonts/default8x16.psf.gz command brltty "$@" else @@ -1526,12 +1526,12 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." # just press 'asdf' keys to toggle between dvorak and us keyboard layout aoeu() { echo -n 'Switching to us keyboard layout: ' - [ -z "$DISPLAY" ] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null + [[ -z "$DISPLAY" ]] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null echo 'Done' } asdf() { echo -n 'Switching to dvorak keyboard layout: ' - [ -z "$DISPLAY" ] && $SUDO loadkeys dvorak &>/dev/null || setxkbmap dvorak &>/dev/null + [[ -z "$DISPLAY" ]] && $SUDO loadkeys dvorak &>/dev/null || setxkbmap dvorak &>/dev/null echo 'Done' } # just press 'asdf' key to toggle from neon layout to us keyboard layout @@ -1548,9 +1548,9 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." print 'ipv6 tunnel already set up, nothing to be done.' print 'execute: "ifconfig sit1 down ; ifconfig sit0 down" to remove ipv6-tunnel.' ; return 1 else - [ -n "$PUBLIC_IP" ] || local PUBLIC_IP=$(ifconfig $(route -n | awk '/^0\.0\.0\.0/{print $8; exit}') | \ + [[ -n "$PUBLIC_IP" ]] || local PUBLIC_IP=$(ifconfig $(route -n | awk '/^0\.0\.0\.0/{print $8; exit}') | \ awk '/inet addr:/ {print $2}' | tr -d 'addr:') - [ -n "$PUBLIC_IP" ] || { print 'No $PUBLIC_IP set and could not determine default one.' ; return 1 } + [[ -n "$PUBLIC_IP" ]] || { print 'No $PUBLIC_IP set and could not determine default one.' ; return 1 } local IPV6ADDR=$(printf "2002:%02x%02x:%02x%02x:1::1" $(print ${PUBLIC_IP//./ })) print -n "Setting up ipv6 tunnel $IPV6ADDR via ${PUBLIC_IP}: " ifconfig sit0 tunnel ::192.88.99.1 up @@ -1606,7 +1606,7 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." # log out? set timeout in seconds {{{ # TMOUT=1800 # do not log out in some specific terminals: -# if [[ "${TERM}" == ([Exa]term*|rxvt|dtterm|screen*) ]]; then +# if [[ "${TERM}" == ([Exa]term*|rxvt|dtterm|screen*) ]] ; then # unset TMOUT # fi # }}} @@ -1616,14 +1616,14 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." # }}} # source another config file if present {{{ - if [ -r /etc/zsh/zshrc.local ]; then + if [[ -r /etc/zsh/zshrc.local ]] ; then source /etc/zsh/zshrc.local fi # }}} # "persistent history" {{{ # just write important commands you always need to ~/.important_commands - if [ -r ~/.important_commands ] ; then + if [[ -r ~/.important_commands ]] ; then fc -R ~/.important_commands fi # }}} -- 2.1.4