From: Michael Prokop <mika@grml.org>
Date: Sat, 2 Dec 2006 15:18:58 +0000 (+0100)
Subject:   * /etc/zsh/zshrc:
X-Git-Tag: 0.2.6~1
X-Git-Url: http://git.grml.org/?p=grml-etc-core.git;a=commitdiff_plain;h=f8575ae892e55a8826f15a20ac3f7de177079afe

  * /etc/zsh/zshrc:
    - our new default umask is now 002.
    - function isutfenv to check whether we are running inside
      an utf environment
    - add option utf8 to alias truec according to result of isutfenv
---

diff --git a/debian/changelog b/debian/changelog
index e7964ff..13dbcb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+grml-etc-core (0.2.5) unstable; urgency=low
+
+  * /etc/zsh/zshrc:
+    - our new default umask is now 002.
+    - function isutfenv to check whether we are running inside
+      an utf environment
+    - add option utf8 to alias truec according to result of isutfenv
+
+ -- Michael Prokop <mika@grml.org>  Sat,  2 Dec 2006 16:08:37 +0100
+
 grml-etc-core (0.2.4) unstable; urgency=low
 
   * /etc/zsh/zshrc: add alias 'any' for grepping through process
diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 528c3ee..e9d02a6 100644
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -47,6 +47,14 @@
     isgrmlsmall() { return 1 }
   fi
 
+  # are we running within an utf environment?
+  isutfenv() {
+    case "$LANG $CHARSET $LANGUAGE" in
+      *utf*) return 0 ;;
+      *)     return 1 ;;
+    esac
+  }
+
 # check for user, if not running as root set $SUDO to sudo
  (( EUID != 0 )) && SUDO='sudo' || SUDO=''
 
@@ -306,7 +314,8 @@ fi
 # }}}
 
 # {{{ set some important options
-  umask 022
+  # umask 022
+  umask 002
 
 # history:
   setopt append_history       # append history list to the history file (important for multiple parallel zsh sessions!)
@@ -535,7 +544,11 @@ ${BLUE}%n${NO_COLOUR}@%m %40<...<%B%~%b%<< %# "
 
 # truecrypt; use e.g. via 'truec /dev/ice' /mnt/ice' or 'truec -i'
   if [ -x /usr/sbin/truecrypt ] ; then
-     alias truec='truecrypt --mount-options "rw,sync,dirsync,users,uid=1000,gid=users,umask=077" '
+     if isutfenv ; then
+        alias truec='truecrypt --mount-options "rw,sync,dirsync,users,uid=1000,gid=users,umask=077,utf8" '
+     else
+        alias truec='truecrypt --mount-options "rw,sync,dirsync,users,uid=1000,gid=users,umask=077" '
+     fi
   fi
 
   zsh-help(){print "$bg[white]$fg[black]
@@ -830,10 +843,10 @@ If you want to use xinit anyway please call \"/usr/bin/xinit\"."
        most /usr/share/doc/${1}/changelog.Debian.gz
     else
        if [ -r /usr/share/doc/${1}/changelog.gz ] ; then
-	  most /usr/share/doc/${1}/changelog.gz
+          most /usr/share/doc/${1}/changelog.gz
        else
-	  echo "No changelog for package $1 found, sorry."
-	  return 1
+          echo "No changelog for package $1 found, sorry."
+          return 1
        fi
     fi
   }