X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=etc%2Fzsh%2Fzshrc;h=c764991edd47c834896fbea0f06fb6f068a4bd3d;hb=0e8f489f9664279e8d43548896c04f8db365da35;hp=bf6d7fb61f93dad60810165df0fbc22a64369fa3;hpb=c1f2dec91f1d93d184832a008ad5e4a93f6eb022;p=grml-etc-core.git

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index bf6d7fb..c764991 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: Son Jän 14 10:57:03 CET 2007 [mika]
+# Latest change: Mon Feb 26 18:52:32 CET 2007 [mika]
 ################################################################################
 # This file is sourced only for interactive shells. It
 # should contain commands to set up aliases, functions,
@@ -58,6 +58,7 @@
   isutfenv() {
     case "$LANG $CHARSET $LANGUAGE" in
       *utf*) return 0 ;;
+      *UTF*) return 0 ;;
       *)     return 1 ;;
     esac
   }
@@ -79,6 +80,8 @@
 # {{{ set some variables
   export EDITOR=${EDITOR:-vim}
   export MAIL=${MAIL:-/var/mail/$USER}
+  # 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`
 
@@ -136,6 +139,13 @@ fi
   bindkey '\e[8~' end-of-line             # end
 #fi
 
+# insert unicode character
+# usage example: 'ctrl-x i' 00A7 'ctrl-x i' will give you an §
+# See for example http://unicode.org/charts/ for unicode characters code
+  autoload insert-unicode-char
+  zle -N insert-unicode-char
+  bindkey '^Xi' insert-unicode-char
+
 #  bindkey '\eq' push-line-or-edit
 # }}}
 
@@ -153,18 +163,18 @@ fi
    '...' '../..'
    '....' '../../..'
    'BG' '& exit'
-   'C' '|wc -l'
+   'C' '| wc -l'
    'G' '|& grep --color=auto'
-   'H' '|head'
+   'H' '| head'
    'Hl' ' --help |& less -r'
-   'L' '|less'
+   'L' '| less'
    'LL' '|& less -r'
-   'M' '|most'
+   'M' '| most'
    'N' '&>/dev/null'
    'R' '| tr A-z N-za-m'
    'SL' '| sort | less'
    'S' '| sort -u'
-   'T' '|tail'
+   'T' '| tail'
    'V' '|& vim -'
    'hide' "echo -en '\033]50;nil2\007'"
    'tiny' 'echo -en "\033]50;-misc-fixed-medium-r-normal-*-*-80-*-*-c-*-iso8859-15\007"'
@@ -234,9 +244,7 @@ fi
   autoload history-search-end
 
   # 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" ] && \
-     autoload -U url-quote-magic && zle -N self-insert url-quote-magic ; then
+  if autoload -U url-quote-magic ; then
      zle -N self-insert url-quote-magic
   else
      print 'Notice: no url-quote-magic available :('
@@ -321,8 +329,7 @@ fi
 # }}}
 
 # {{{ set some important options
-  # umask 022
-  umask 002
+  (( EUID != 0 )) && umask 002 || umask 022
 
 # history:
   setopt append_history       # append history list to the history file (important for multiple parallel zsh sessions!)
@@ -393,7 +400,7 @@ fi
 
 # {{{ display battery status on right side of prompt via running 'BATTERY=1 zsh'
   if [ -n "$BATTERY" ] ; then
-     if [ -x =acpi ] ; then
+     if [ -x $(which acpi) ] ; then
         PERCENT="${(C)${(s| |)$(acpi 2>/dev/null)}[4]}"
         [ -z "$PERCENT" ] && PERCENT='acpi not present'
         if [ "${PERCENT%%%}" -lt 20 ] ; then
@@ -404,7 +411,7 @@ fi
 # }}}
 
 # {{{ set prompt
-  if [ -f "/usr/share/zsh/$ZSH_VERSION/functions/Prompts/promptinit" ] && autoload promptinit && promptinit 2>/dev/null ; then
+  if autoload promptinit && promptinit 2>/dev/null ; then
      promptinit # people should be able to use their favourite prompt
   else
      print 'Notice: no promptinit available :('
@@ -664,8 +671,8 @@ Enjoy your grml system with the zsh!$reset_color"
   fi
 
 # if cdrecord is a symlink (to wodim) or isn't present at all warn:
-  if [ -L /usr/bin/cdrecord -o ! -x =cdrecord ] ; then
-     if [ -x =wodim ] ; then
+  if [ -L /usr/bin/cdrecord -o ! -x $(which cdrecord) ] ; then
+     if [ -x $(which 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.