X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=ff2fe2c3e65b0ee74c332390e1470472a70e67b7;hb=44caa64f88f6786d44c5e3c95d1e12c5e5e0890e;hp=99642aa59dc2525bd179ecd7447f634904ffad82;hpb=538b20715841b392eb9b8f7a410546e78de57afa;p=grml-etc-core.git

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 99642aa..ff2fe2c 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -3,7 +3,7 @@
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mit Okt 25 23:44:27 CEST 2006 [mika]
+# Latest change: Son Nov 19 14:45:18 CET 2006 [mika]
 ################################################################################
 # This file is sourced only for interactive shells. It
 # should contain commands to set up aliases, functions,
@@ -14,7 +14,7 @@
 
 # {{{ check for version/system
 # check for versions (compatibility reasons)
-  if autoload is-at-least && is-at-least ; then
+  if autoload is-at-least && is-at-least 2>/dev/null ; then
      is4() { is-at-least 4 }
      is42() { is-at-least 4.2 }
   else
@@ -39,6 +39,14 @@
     return 1
   }
 
+  if isgrml ; then
+    isgrmlsmall() {
+    [[ ${${${(f)"$(</etc/grml_version)"}%% *}##*-} == 'small' ]] && return 0 ; return 1
+  }
+  else
+    isgrmlsmall() { return 1 }
+  fi
+
 # check for user, if not running as root set $SUDO to sudo
  (( EUID != 0 )) && SUDO='sudo' || SUDO=''
 
@@ -55,7 +63,6 @@
 
 # {{{ set some variables
   export EDITOR=${EDITOR:-vim}
-  export SHELL=${SHELL:-/bin/zsh}
   export MAIL=${MAIL:-/var/mail/$USER}
   [[ -f ~/.terminfo/m/mostlike ]] && MYLESS='LESS=C TERMINFO=~/.terminfo TERM=mostlike less' || MYLESS='less'
   [[ -x /usr/bin/dircolors ]] && eval `dircolors -b`
@@ -64,7 +71,7 @@
 #  cdpath=(.. ~)
 
 # Support our own site-functions
-  [ -d /etc/zsh/site-functions ] && export FPATH=/etc/zsh/site-functions:$FPATH
+  [ -d /etc/zsh/site-functions ] && FPATH=/etc/zsh/site-functions:$FPATH
 
 # automatically remove duplicates from these arrays
   typeset -U path cdpath fpath manpath
@@ -123,8 +130,9 @@ fi
 
   # we don't want to quote/espace URLs on our own...
   # avoid 'url-quote-magic: function definition file not found' on some older boxes
-  if [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Zle/url-quote-magic" ] ; then
-     autoload -U url-quote-magic && zle -N self-insert url-quote-magic
+  if [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Zle/url-quote-magic" ] && \
+     autoload -U url-quote-magic && zle -N self-insert url-quote-magic ; then
+     zle -N self-insert url-quote-magic
   else
      print 'Notice: no url-quote-magic available :('
   fi
@@ -133,7 +141,7 @@ fi
   autoload run-help # use via 'esc-h'
 
 # completion system
-  is42 && if autoload -U compinit && [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Completion/compinit" ] ; then
+  if autoload -U compinit && [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Completion/compinit" ] && compinit 2>/dev/null ; then
     compinit
    else
      print 'Notice: no compinit available :('
@@ -279,19 +287,21 @@ fi
 # }}}
 
 # {{{ set prompt
-  if [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Prompts/promptinit" ] ; then
-     autoload promptinit && promptinit # people should be able to use their favourite prompt
+  if [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Prompts/promptinit" ] && autoload promptinit && promptinit 2>/dev/null ; then
+     promptinit # people should be able to use their favourite prompt
   else
-     print 'Notice: no prompiinit available :('
+     print 'Notice: no promptinit available :('
   fi
   # precmd() => a function which is executed just before each prompt
   # precmd () { setopt promptsubst; [[ -o interactive ]] && jobs -l;
   # run 'NOPRECMD=1 zsh' to disable the precmd + preexec commands
   is4 && ! [[ -n "$NOPRECMD" ]] && precmd () {
       if [ -n "$BATTERY" ] ; then
-        RPROMPT="%(?..:()% ${PERCENT}${SCREENTITLE}"
+        # RPROMPT="%(?..:()% ${PERCENT}${SCREENTITLE}"
+        RPROMPT="${PERCENT}${SCREENTITLE}"
       else
-        RPROMPT="%(?..:()% ${SCREENTITLE}"
+        # RPROMPT="%(?..:()% ${SCREENTITLE}"
+        RPROMPT="${SCREENTITLE}"
       fi
       # adjust title of xterm
       # see http://www.faqs.org/docs/Linux-mini/Xterm-Title.html
@@ -330,7 +340,7 @@ fi
   }
 
 # set colors
-  if autoload colors && colors ; then
+  if autoload colors && colors 2>/dev/null ; then
      BLUE="%{${fg[blue]}%}"
      RED="%{${fg_bold[red]}%}"
      GREEN="%{${fg[green]}%}"
@@ -436,9 +446,13 @@ zsh-help - hints for use of zsh on grml
 
 Main configuration of zsh happens in /etc/zsh/zshrc (global)
 and /etc/skel/.zshrc which is copied to \$HOME/.zshrc once.
-The files are part of the package grml-etc, if you want to
+The files are part of the package grml-etc-core, if you want to
 use them on a non-grml-system just get the tar.gz from
-http://grml.org/repos/
+http://grml.org/repos/ or get the files from the mercurial
+repository:
+
+  http://hg.grml.org/grml-etc-core/raw-file/tip/etc/skel/.zshrc
+  http://hg.grml.org/grml-etc-core/raw-file/tip/etc/zsh/zshrc
 
 If you want to stay in sync with zsh configuration of grml
 run 'ln -sf /etc/skel/.zshrc \$HOME/.zshrc' and configure
@@ -477,14 +491,15 @@ Enjoy your grml system with the zsh!$reset_color"
 
 # debian stuff
   if [ -r /etc/debian_version ] ; then
-    alias acs="apt-cache search"
-    alias acsh="apt-cache show"
+    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 ag="$SUDO apt-get upgrade"
     alias au="$SUDO apt-get update"
-    alias dbp="dpkg-buildpackage"
-    alias ge="grep-excuses"
+    alias dbp='dpkg-buildpackage'
+    alias ge='grep-excuses'
 
     isgrmlcd && alias su="sudo su"          # change to user root
     alias tlog="tail -f /var/log/syslog"    # take a look at the syslog
@@ -656,8 +671,7 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"."
   alias grml-version='cat /etc/grml_version'
 
   if [ -x /usr/sbin/rebuildfstab ] ; then
-     local fstabuser=$(getent passwd 1000 | cut -d: -f1)
-     alias grml-rebuildfstab="rebuildfstab -v -r -u $fstabuser -g $fstabuser"
+     alias grml-rebuildfstab='rebuildfstab -v -r -config'
   fi
 }
 # }}}
@@ -691,8 +705,8 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"."
   setenv()  { typeset -x "${1}${1:+=}${(@)argv[2,$#]}" }  # csh compatibility
   freload() { while (( $# )); do; unfunction $1; autoload -U $1; shift; done }
   manzsh()  {  /usr/bin/man zshall |  vim -c "se ft=man| se hlsearch" +/"$1" - ; }
+#  manzsh()  { /usr/bin/man zshall |  most +/"$1" ; }
 #  manzsh()  { man zshall | $MYLESS -p $1 ; }
-#  manzsh() {  /usr/bin/man zshall |  most +/"$1" ; }
 
 # use "dchange <package-name>" to view Debian's changelog of the package:
   dchange() {