X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=fde07a30e4d7475b2d0b370cbcd57548d12e3dd6;hb=ccc94f4a8dcf92bdf3adacbdbf97c18b55fa0f8d;hp=67fc6400af84650d51a0faa1dd4a8c1fa729b49c;hpb=789fd75316c26ae394c3c32f7664139fc996a110;p=grml-etc-core.git diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc index 67fc640..fde07a3 100644 --- a/etc/zsh/zshrc +++ b/etc/zsh/zshrc @@ -1,4 +1,4 @@ -# Filename: zshrc +# Filename: /etc/zsh/zshrc # Purpose: config file for zsh (z shell) # Authors: grml-team (grml.org), (c) Michael Prokop # Bug-Reports: see http://grml.org/bugs/ @@ -233,7 +233,12 @@ NOPRECMD=${NOPRECMD:-0} BATTERY=${BATTERY:-0} GRMLSMALL_SPECIFIC=${GRMLSMALL_SPECIFIC:-1} GRML_ALWAYS_LOAD_ALL=${GRML_ALWAYS_LOAD_ALL:-0} -GRML_WARN_SKEL=${GRML_WARN_SKEL:-1} + +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 @@ -249,11 +254,12 @@ 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. +from on non-grml systems. -Please see the current grml-zsh-refcard for updated installation -information. In short, you don'\''t want a .zshrc.global file. Install -the global zshrc to ~/.zshrc and be done. +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. @@ -512,12 +518,6 @@ fi # do Fink setup on darwin isdarwin && xsource /sw/bin/init.sh -# set width of man pages to 80 for more convenient reading -# export MANWIDTH=${MANWIDTH:-80} - -# Search path for the cd command -# cdpath=(.. ~) - # 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. @@ -526,10 +526,12 @@ if [[ -n "$BROKEN_COMPLETION_DIR" ]] ; then else [[ -d /etc/zsh/completion.d ]] && fpath=( $fpath /etc/zsh/completion.d ) if [[ -d /etc/zsh/functions.d ]] ; then - fpath+=( /etc/zsh/functions.d ) - for func in /etc/zsh/functions.d/[^_]*[^~](N.) ; do - zrcautoload -U ${func:t} + fdir='/etc/zsh/functions.d' + fpath=( ${fdir} ${fdir}/**/*(/N) ${fpath} ) + for func in ${fdir}/**/[^_]*[^~](N.) ; do + zrcautoload ${func:t} done + unset fdir fi fi @@ -1973,7 +1975,7 @@ is4 && [[ $NOPRECMD -eq 0 ]] && precmd () { # adjust title of xterm # see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html case $TERM in - (xterm*|rxvt) + (xterm*|rxvt*) print -Pn "\e]0;%n@%m: %~\a" ;; esac @@ -2347,7 +2349,7 @@ limit -s # {{{ completion system # called later (via is4 && grmlcomp) -# notice: use 'zstyle' for getting current settings +# note: 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 grmlcomp() { # TODO: This could use some additional information @@ -3303,7 +3305,7 @@ if [[ -r ~/.terminfo/m/mostlike ]] ; then fi # d():Copyright 2005 Nikolai Weibull -# notice: option AUTO_PUSHD has to be set +# note: option AUTO_PUSHD has to be set #f5# Jump between directories d() { emulate -L zsh @@ -3840,16 +3842,21 @@ mkmaildir() { mkdir -p ${root}/${subdir}/{cur,new,tmp} } -# xtrename() rename xterm from within GNU-screen +#f5# Change the xterm title from within GNU-screen xtrename() { - if [[ -z ${DISPLAY} ]] ; then - printf 'xtrename only makes sense in X11.\n' - return 1 + if [[ ${1} != "-f" ]] ; then + if [[ -z ${DISPLAY} ]] ; then + printf 'xtrename only makes sense in X11.\n' + return 1 + fi + else + shift fi if [[ -z ${1} ]] ; then - printf 'usage: xtrename() "title for xterm"\n' + printf 'usage: xtrename [-f] "title for xterm"\n' printf ' renames the title of xterm from _within_ screen.\n' - printf ' Also works without screen.\n' + printf ' also works without screen.\n' + printf ' will not work if DISPLAY is unset, use -f to override.\n' return 0 fi print -n "\eP\e]0;${1}\C-G\e\\" @@ -3915,17 +3922,30 @@ if check_com -c highlight ; then compdef _hl_complete hl fi -# create small urls via tinyurl.com using wget, grep and sed -zurl() { - [[ -z ${1} ]] && print "please give an url to shrink." && return 1 - local url=${1} - local tiny="http://tinyurl.com/create.php?url=" - #print "${tiny}${url}" ; return - wget -O- \ - -o/dev/null \ - "${tiny}${url}" \ - | grep -Eio 'value="(http://tinyurl.com/.*)"' \ - | sed 's/value=//;s/"//g' +# Create small urls via http://tinyurl.com using wget(1). +function zurl() { + [[ -z ${1} ]] && { print "USAGE: zurl " ; return 1 } + + local PN url tiny grabber search result preview + PN=${0} + url=${1} +# 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} } #f2# Print a specific line of file(s).