X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=b609ce2f678d596f2efcf5199aba8963d8129011;hb=11963d4f26dd73ae8d8d0009d02d002ac0917ee9;hp=153f61d25900c052159b135fd403e5f9cc911d27;hpb=0f258b3509c2d5c097e3ca051f8e9b233cb5cd0d;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 153f61d..b609ce2 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/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: Sam Mär 17 20:12:26 CET 2007 [mika] +# Latest change: Sam Jun 09 18:44:38 CEST 2007 [mika] ################################################################################ # This file is sourced only for interactive shells. It # should contain commands to set up aliases, functions, @@ -19,6 +19,32 @@ fi # }}} +# 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 +# }}} + # {{{ check for version/system # check for versions (compatibility reasons) if autoload is-at-least && is-at-least 2>/dev/null ; then @@ -66,6 +92,41 @@ # check for user, if not running as root set $SUDO to sudo (( EUID != 0 )) && SUDO='sudo' || SUDO='' + salias() { + # creates an alias and precedes the command with + # sudo if $EUID is not zero. + local only=0 ; local multi=0 + while [[ ${1} == -* ]] ; do + case ${1} in + (-o) only=1 ;; + (-a) multi=1 ;; + (--) shift ; break ;; + (-h) + printf 'usage: salias [-h|-o|-a] \n' + printf ' -h shows this help text.\n' + printf ' -a replace '\'' ; '\'' sequences with '\'' ; sudo '\''.\n' + printf ' be careful using this option.\n' + printf ' -o only sets an alias if a preceding sudo would be needed.\n' + return 0 + ;; + (*) printf "unkown option: '%s'\n" "${1}" ; return 1 ;; + esac + shift + done + if (( ${#argv} > 1 )) ; then + printf 'Too many arguments %s\n' "${#argv}" + return 1 + fi + key="${1%%\=*}" ; val="${1#*\=}" + if (( EUID == 0 )) && (( only == 0 )); then + alias -- "${key}=${val}" + elif (( EUID > 0 )) ; then + (( multi > 0 )) && val="${val// ; / ; sudo }" + alias -- "${key}=sudo ${val}" + fi + return 0 + } + # change directory to home on first invocation of zsh # important for rungetty -> autologin # Thanks go to Bart Schaefer! @@ -83,13 +144,25 @@ # if we don't set $SHELL then aterm, rxvt,.. will use /bin/sh or /bin/bash :-/ export SHELL='/bin/zsh' [[ -f ~/.terminfo/m/mostlike ]] && MYLESS='LESS=C TERMINFO=~/.terminfo TERM=mostlike less' || MYLESS='less' - [[ -x /usr/bin/dircolors ]] && eval `dircolors -b` + [ -x $(which dircolors) ] && eval `dircolors -b` # Search path for the cd comman # cdpath=(.. ~) -# Support our own site-functions - [ -d /etc/zsh/site-functions ] && FPATH=/etc/zsh/site-functions:$FPATH +# completion functions go to /etc/zsh/completion.d +# function files may be put into /etc/zsh/functions.d, from where they +# will be automatically autoloaded. + if [ -n "$BROKEN_COMPLETION_DIR" ] ; then + print 'Warning: not setting completion directories because broken files have been found.'>&2 + else + [[ -d /etc/zsh/completion.d ]] && fpath+=( /etc/zsh/completion.d ) + if [[ -d /etc/zsh/functions.d ]] ; then + fpath+=( /etc/zsh/functions.d ) + for func in /etc/zsh/functions.d/[^_]*[^~] ; do + autoload -U ${func:t} + done + fi + fi # automatically remove duplicates from these arrays typeset -U path cdpath fpath manpath @@ -110,14 +183,14 @@ [[ -z "$terminfo[kcuf1]" ]] || bindkey -M viins "$terminfo[kcuf1]" vi-forward-char [[ -z "$terminfo[kcub1]" ]] || bindkey -M viins "$terminfo[kcub1]" vi-backward-char # ncurses stuff: - [[ "$terminfo[kcuu1]" == "O"* ]] && bindkey -M viins "${terminfo[kcuu1]/O/[}" vi-up-line-or-history - [[ "$terminfo[kcud1]" == "O"* ]] && bindkey -M viins "${terminfo[kcud1]/O/[}" vi-down-line-or-history - [[ "$terminfo[kcuf1]" == "O"* ]] && bindkey -M viins "${terminfo[kcuf1]/O/[}" vi-forward-char - [[ "$terminfo[kcub1]" == "O"* ]] && bindkey -M viins "${terminfo[kcub1]/O/[}" vi-backward-char - [[ "$terminfo[khome]" == "O"* ]] && bindkey -M viins "${terminfo[khome]/O/[}" beginning-of-line - [[ "$terminfo[kend]" == "O"* ]] && bindkey -M viins "${terminfo[kend]/O/[}" end-of-line - [[ "$terminfo[khome]" == "O"* ]] && bindkey -M emacs "${terminfo[khome]/O/[}" beginning-of-line - [[ "$terminfo[kend]" == "O"* ]] && bindkey -M emacs "${terminfo[kend]/O/[}" end-of-line + [[ "$terminfo[kcuu1]" == $'\eO'* ]] && bindkey -M viins "${terminfo[kcuu1]/O/[}" vi-up-line-or-history + [[ "$terminfo[kcud1]" == $'\eO'* ]] && bindkey -M viins "${terminfo[kcud1]/O/[}" vi-down-line-or-history + [[ "$terminfo[kcuf1]" == $'\eO'* ]] && bindkey -M viins "${terminfo[kcuf1]/O/[}" vi-forward-char + [[ "$terminfo[kcub1]" == $'\eO'* ]] && bindkey -M viins "${terminfo[kcub1]/O/[}" vi-backward-char + [[ "$terminfo[khome]" == $'\eO'* ]] && bindkey -M viins "${terminfo[khome]/O/[}" beginning-of-line + [[ "$terminfo[kend]" == $'\eO'* ]] && bindkey -M viins "${terminfo[kend]/O/[}" end-of-line + [[ "$terminfo[khome]" == $'\eO'* ]] && bindkey -M emacs "${terminfo[khome]/O/[}" beginning-of-line + [[ "$terminfo[kend]" == $'\eO'* ]] && bindkey -M emacs "${terminfo[kend]/O/[}" end-of-line fi ## keybindings (run 'bindkeys' for details, more details via man zshzle) @@ -129,8 +202,8 @@ fi #if [[ "$TERM" == screen ]]; then bindkey '\e[1~' beginning-of-line # home bindkey '\e[4~' end-of-line # end - bindkey "^[[A" up-line-or-search # cursor up - bindkey "^[[B" down-line-or-search # - + bindkey '\e[A' up-line-or-search # cursor up + bindkey '\e[B' down-line-or-search # - bindkey '^x' history-beginning-search-backward # alternative ways of searching the shell history # bindkey -s '^L' "|less\n" # ctrl-L pipes to less # bindkey -s '^B' " &\n" # ctrl-B runs it in the background @@ -227,6 +300,7 @@ fi 'fbmplayer' 'mplayer -vo -fs -zoom fbdev' 'fblinks' 'links2 -driver fb' 'insecssh' 'ssh -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null"' + 'insecscp' 'scp -o "StrictHostKeyChecking=no" -o "UserKnownHostsFile=/dev/null"' 'fori' 'for i ({..}) { }' 'cx' 'chmod +x' 'e' 'print -l' @@ -255,11 +329,13 @@ fi autoload history-search-end # we don't want to quote/espace URLs on our own... - if autoload -U url-quote-magic ; then - zle -N self-insert url-quote-magic - else - print 'Notice: no url-quote-magic available :(' - fi + # if autoload -U url-quote-magic ; then + # zle -N self-insert url-quote-magic + # zstyle ':url-quote-magic:*' url-metas '*?[]^()~#{}=' + # else + # print 'Notice: no url-quote-magic available :(' + # fi + alias url-quote='autoload -U url-quote-magic ; zle -N self-insert url-quote-magic' alias run-help >&/dev/null && unalias run-help autoload run-help # use via 'esc-h' @@ -273,7 +349,7 @@ fi function compdef { } fi - is4 && autoload -U zed # use ZLE editor to edit a file or function + is4 && autoload -U zed # use ZLE editor to edit a file or function is4 && for mod in complist deltochar mathfunc ; do zmodload -i zsh/${mod} 2>/dev/null || print "Notice: no ${mod} available :(" @@ -402,7 +478,7 @@ fi if [[ -f ~/.zdirs ]] && [[ ${#dirstack[*]} -eq 0 ]]; then dirstack=( ${(uf)"$(< ~/.zdirs)"} ) # "cd -" won't work after login by just setting $OLDPWD, so - cd $dirstack[0] && cd $OLDPWD + [[ -d $dirstack[0] ]] && cd $dirstack[0] && cd $OLDPWD fi chpwd() { builtin dirs -pl >! ~/.zdirs @@ -433,17 +509,25 @@ fi # precmd () { setopt promptsubst; [[ -o interactive ]] && jobs -l; + # make sure to use right prompt only when not running a command + is4 && setopt transient_rprompt + is4 && [[ -z $NOPRECMD ]] && precmd () { [[ -n $NOPRECMD ]] && return 0 + # allow manual overwriting of RPROMPT + if [[ -n $RPROMPT ]] ; then + [[ $TERM == screen* ]] && echo -n $'\ekzsh\e\\' + return 0 + fi # just use DONTSETRPROMPT=1 to be able to overwrite RPROMPT - if [[ -z ${DONTSETRPROMPT} ]] ; then - if [ -n "$BATTERY" ] ; then - # RPROMPT="%(?..:()% ${PERCENT}${SCREENTITLE}" - RPROMPT="${PERCENT}${SCREENTITLE}" - else - # RPROMPT="%(?..:()% ${SCREENTITLE}" - RPROMPT="${SCREENTITLE}" - fi + if [[ -z $DONTSETRPROMPT ]] ; then + if [[ -n $BATTERY ]] ; then + RPROMPT="%(?..:()% ${PERCENT}${SCREENTITLE}" + # RPROMPT="${PERCENT}${SCREENTITLE}" + else + RPROMPT="%(?..:()% ${SCREENTITLE}" + # RPROMPT="${SCREENTITLE}" + fi fi # adjust title of xterm # see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html @@ -466,15 +550,15 @@ 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 - # local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} # dont't use hostname - local CMD="${1[(wr)^(*=*|sudo|ssh|-*)]}$NAME" # use hostname - echo -ne "\ek$CMD\e\\" + # local CMD=${1[(wr)^(*=*|sudo|ssh|-*)]} # dont'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 - SCREENTITLE=$'%{\ekzsh\e\\%}' + SCREENTITLE=$'%{\ekzsh\e\\%}' else - SCREENTITLE='' + SCREENTITLE='' fi # adjust title of xterm case $TERM in (xterm*|rxvt) @@ -492,12 +576,12 @@ fi WHITE="%{${fg[white]}%}" NO_COLOUR="%{${reset_color}%}" else - BLUE="%{%}" - RED="%{%}" - GREEN="%{%}" - CYAN="%{%}" - WHITE="%{%}" - NO_COLOUR="%{%}" + BLUE=$'%{\e[1;34m%}' + RED=$'%{\e[1;31m%}' + GREEN=$'%{\e[1;32m%}' + CYAN=$'%{\e[1;36m%}' + WHITE=$'%{\e[1;37m%}' + NO_COLOUR=$'%{\e[0m%}' fi EXITCODE="%(?..%?%1v )" @@ -512,11 +596,11 @@ 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%<< %# " + 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 [[ -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 @@ -581,8 +665,8 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# " alias md='mkdir' # see http://www.cl.cam.ac.uk/~mgk25/unicode.html#term for details - alias term2iso="echo 'Setting terminal to iso mode' ; echo -e '%@'" - alias term2utf="echo 'Setting terminal to utf-8 mode'; echo -e '%G'" + alias term2iso="echo 'Setting terminal to iso mode' ; print -n '\e%@'" + alias term2utf="echo 'Setting terminal to utf-8 mode'; print -n '\e%G'" alias utf2iso='if isutfenv ; then for ENV in `env | grep UTF` ; do @@ -606,15 +690,16 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# " unsetopt prompt_cr export PS1="%m%# " nice -n -20 speechd-up + sleep 2 flite -o play -t "Finished setting up software synthesizer" fi ' - # I like clean prompt, so provide simple way to get that +# I like clean prompt, so provide simple way to get that alias 0 &>/dev/null || functions 0 &>/dev/null || alias 0='return 0' # truecrypt; use e.g. via 'truec /dev/ice /mnt/ice' or 'truec -i' - if [ -x /usr/sbin/truecrypt ] ; then + if [ -x $(which truecrypt) ] ; then if isutfenv ; then alias truec='truecrypt --mount-options "rw,sync,dirsync,users,uid=1000,gid=users,umask=077,utf8" ' else @@ -676,12 +761,12 @@ Enjoy your grml system with the zsh!$reset_color" alias acs='apt-cache search' alias acsh='apt-cache show' alias acp='apt-cache policy' - alias adg="$SUDO apt-get dist-upgrade" - alias agi="$SUDO apt-get install" - alias ati="$SUDO aptitude install" - alias ag="$SUDO apt-get upgrade" - alias au="$SUDO apt-get update" - alias up="$SUDO aptitude update ; $SUDO aptitude upgrade" + salias adg="apt-get dist-upgrade" + salias agi="apt-get install" + salias ati="aptitude install" + salias ag="apt-get upgrade" + salias au="apt-get update" + salias -a up="aptitude update ; aptitude upgrade" alias dbp='dpkg-buildpackage' alias ge='grep-excuses' @@ -703,13 +788,14 @@ Enjoy your grml system with the zsh!$reset_color" fi } - isgrmlcd && alias su="sudo su" # change to user root - alias tlog="tail -f /var/log/syslog" # take a look at the syslog + isgrmlcd && alias su="sudo -s" # get a root shell + alias llog="$PAGER /var/log/syslog" # take a look at the syslog + alias tlog="tail -f /var/log/syslog" # follow the syslog alias zshskel="source /etc/skel/.zshrc" # source skeleton zshrc fi # sort installed Debian-packages by size - if [ -x /usr/bin/grep-status ] ; then + if [ -x $(which grep-status) ] ; then alias debs-by-size='grep-status -FStatus -sInstalled-Size,Package \ -n "install ok installed" | paste -sd " \n" | sort -rn' fi @@ -724,9 +810,17 @@ Please use the wodim binary instead' ; return 1" fi fi +# get_tw_cli has been renamed into get_3ware + if [ -x $(which 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 + } + fi + # I hate lacking backward compability, so provide an alternative therefore - if ! [ -x /usr/sbin/apache2-ssl-certificate ] ; then - function apache2-ssl-certificate(){ + if ! [ -x $(which apache2-ssl-certificate) ] ; then + apache2-ssl-certificate(){ print 'Debian does not ship apache2-ssl-certificate anymore (see #398520). :(' print 'You might want to take a look at Debian the package ssl-cert as well.' @@ -754,12 +848,6 @@ Run "grml-tips ssl-certificate" if you need further instructions. # {{{ completion stuff -# Where to look for autoloaded function definitions - if [ -d /etc/zsh/completion.d ] ; then - local comp=/etc/zsh/completion.d - for func in $comp/*(N-.:t); . ${comp}/${func} - fi - # called later (via is4 && grmlcomp) # notice: use 'zstyle' for getting current settings # press ^Xh (control-x h) for getting tags in context; ^X? (control-x ?) to run complete_debug with trace output @@ -831,7 +919,7 @@ grmlcomp() { # zstyle ':completion:*' expand prefix suffix # automatic rehash? Credits go to Frank Terbeck -# function my_accept () { +# my_accept() { # local buf # [[ -z ${BUFFER} ]] && zle accept-line && return # buf=( ${(z)BUFFER} ) @@ -899,7 +987,7 @@ grmlcomp() { # {{{ grmlstuff grmlstuff() { # people should use 'grml-x'! - function startx() { + startx() { if [ -e /etc/X11/xorg.conf ] ; then [ -x /usr/bin/startx ] && /usr/bin/startx || /usr/X11R6/bin/startx else @@ -910,7 +998,7 @@ If you want to use startx anyway please call \"/usr/bin/startx\"." fi } - function xinit() { + xinit() { if [ -e /etc/X11/xorg.conf ] ; then [ -x /usr/bin/xinit ] && /usr/bin/xinit || /usr/X11R6/bin/xinit else @@ -921,15 +1009,19 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." fi } - if [ -x /usr/sbin/915resolution ] ; then + if [ -x $(which 915resolution) ] ; then alias 855resolution='echo -e "Please use 915resolution as resolution modify tool for Intel graphic chipset."; return -1' fi alias grml-version='cat /etc/grml_version' - if [ -x /usr/sbin/rebuildfstab ] ; then + if [ -x $(which rebuildfstab) ] ; then alias grml-rebuildfstab='rebuildfstab -v -r -config' fi + + if [ -x $(which grml-debootstrap) ] ; then + alias debian2hd='print "Installing debian to harddisk is possible via using grml-debootstrap." ; return 1' + fi } # }}} @@ -974,18 +1066,16 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." } compdef _functions reload freload - # list symlinks in detail (more detailed version of 'readlinkg -f') + # list symlinks in detail (more detailed version of 'readlink -f' and 'whence -s') sll() { - if [ -z "$1" ] ; then - print 'Usage: sll ' >&2 - return 1 - fi - for i in $* ; do - ls --color=auto -la "$i" - if [ -L "$i" ] ; then - sll $(readlink "$i") - fi - done + [ -z "$1" ] && printf 'Usage: %s \n' "$0" && return 1 + for i in "$@" ; do + file=$i + while [ -h "$file" ] ; do + ls -l $file + file=$(readlink "$file") + done + done } # fast manual access @@ -998,7 +1088,7 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." # manzsh() { man zshall | $MYLESS -p $1 ; } fi - if [ -x /usr/bin/most ] ; then + if [ -x $(which most) ] ; then # use "dchange " to view Debian's changelog of the package: dchange() { if [ -r /usr/share/doc/${1}/changelog.Debian.gz ] ; then @@ -1014,7 +1104,7 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." } _dchange() { _files -W /usr/share/doc -/ } compdef _dchange dchange - + # use "uchange " to view upstream's changelog of the package: uchange() { if [ -r /usr/share/doc/${1}/changelog.gz ] ; then @@ -1132,6 +1222,82 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." } functions peval &>/dev/null && alias calc=peval + # 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 + consolechars -f /usr/share/consolefonts/default8x16.psf.gz + command brltty "$@" + else + command brltty "$@" + fi + } + + # just press 'asdf' keys to toggle between dvorak and us keyboard layout + aoeu() { + if [ -n "$XKEYBOARD" -a -n "$KEYTABLE" ] ; then + echo -n "Switching to $KEYTABLE keyboard layout: " + [ -z "$DISPLAY" ] && $SUDO loadkeys $KEYTABLE &>/dev/null || setxkbmap $XKEYBOARD &>/dev/null + else + echo -n 'Switching to us keyboard layout: ' + [ -z "$DISPLAY" ] && $SUDO loadkeys us &>/dev/null || setxkbmap us &>/dev/null + fi + echo 'Done' + } + asdf() { + echo -n 'Switching to dvorak keyboard layout: ' + [ -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 + uiae() { + echo -n 'Switching to us keyboard layout: ' + setxkbmap us && echo 'Done' || echo 'Failed' + } + + # set up an ipv6 tunnel + ipv6-tunnel() { + case $1 in + start) + if ifconfig sit1 2>/dev/null | grep -q 'inet6 addr: 2002:.*:1::1' ; then + 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}') | \ + awk '/inet addr:/ {print $2}' | tr -d 'addr:') + [ -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 + ifconfig sit1 add "$IPV6ADDR" && print done || print failed + fi + ;; + status) + if ifconfig sit1 2>/dev/null | grep -q 'inet6 addr: 2002:.*:1::1' ; then + print 'ipv6 tunnel available' ; return 0 + else + print 'ipv6 tunnel not available' ; return 1 + fi + ;; + stop) + if ifconfig sit1 2>/dev/null | grep -q 'inet6 addr: 2002:.*:1::1' ; then + print -n 'Stopping ipv6 tunnel (sit0 + sit1): ' + ifconfig sit1 down ; ifconfig sit0 down && print done || print failed + else + print 'No ipv6 tunnel found, nothing to be done.' ; return 1 + fi + ;; + *) + print "Usage: ipv6-tunnel [start|stop|status]">&2 ; return 1 + ;; + esac + } + + # run dhclient for wireless device + iwclient() { + salias dhclient "$(wavemon -d | awk '/device/{print $2}')" + } + # Switching shell safely and efficiently? http://www.zsh.org/mla/workers/2001/msg02410.html # bash() { # NO_SWITCH="yes" command bash "$@" @@ -1167,5 +1333,9 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"." fi # }}} +# add variable to be able to check whether the file has been read {{{ + ZSHRC_GLOBAL_HAS_BEEN_READ=1 +# }}} + ## END OF FILE ################################################################# # vim:foldmethod=marker expandtab