/etc/zsh/zshenv: make sure /usr/bin/id is available

diff --git a/debian/changelog b/debian/changelog
index 9bffa97..f9727b1 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-etc-core (0.3.19) unstable; urgency=low
+
+  * /etc/zsh/zshenv: make sure /usr/bin/id is available
+
+ -- Michael Prokop <mika@grml.org>  Wed, 25 Jul 2007 15:02:08 +0200
+
 grml-etc-core (0.3.18) unstable; urgency=low
 
   * /etc/zsh/zshrc:

diff --git a/etc/zsh/zshenv b/etc/zsh/zshenv
index 93988c0..85458f9 100644 (file)
--- a/etc/zsh/zshenv
+++ b/etc/zsh/zshenv
@@ -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: Mon Jul 23 11:37:26 CEST 2007 [mika]
+# Latest change: Mit Jul 25 15:02:01 CEST 2007 [mika]
 ################################################################################
 # This file is sourced on all invocations of the shell.
 # It is the 1st file zsh reads; it's read for every shell,
@@ -26,9 +26,12 @@
   [ -r /etc/environment    ] && source /etc/environment
 
 # set environment variables (important for autologin on tty)
-  [ -z "$HOSTNAME" ]      && export HOSTNAME=`hostname`
-  [ -z "$USER" ]          && export USER=`id -un`
-  [[ $LOGNAME == LOGIN ]] && LOGNAME=$(id -un)
+  [ -z "$HOSTNAME" ]      && export HOSTNAME=$(hostname)
+  # make sure /usr/bin/id is available
+  if [ -x /usr/bin/id ] ; then
+     [ -z "$USER" ]          && export USER=$(/usr/bin/id -un)
+     [[ $LOGNAME == LOGIN ]] && LOGNAME=$(/usr/bin/id -un)
+  fi
 
 # workaround for live-cd mode as $HOME is not set via rungetty
   if [ -f /etc/grml_cd ] ; then