/etc/zsh/zshrc: check for upper letters in isutfenv as well

[grml-etc-core.git] / etc / zsh / zshrc

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index fbefb58..843b0f8 100644 (file)
--- 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: Fre Jän 05 19:35:27 CET 2007 [mika]
+# Latest change: Son Jän 14 10:57:03 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
   }
@@ -393,7 +394,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
@@ -564,7 +565,7 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# "
   # 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'
+# truecrypt; use e.g. via 'truec /dev/ice /mnt/ice' or 'truec -i'
   if [ -x /usr/sbin/truecrypt ] ; then
      if isutfenv ; then
         alias truec='truecrypt --mount-options "rw,sync,dirsync,users,uid=1000,gid=users,umask=077,utf8" '
@@ -664,8 +665,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.
 
@@ -926,6 +927,7 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"."
   # fast manual access
   if type -p qma &>/dev/null ; then
      manzsh()  { qma zshall "$1" }
+     compdef _man qma
   else
      manzsh()  { /usr/bin/man zshall |  vim -c "se ft=man| se hlsearch" +/"$1" - ; }
      # manzsh()  { /usr/bin/man zshall |  most +/"$1" ; }