/etc/zsh/zshrc: check for $SUDO and do not use it when running as root

diff --git a/debian/changelog b/debian/changelog
index 6ec5318..659777a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-etc-core (0.3.0) unstable; urgency=low
+
+  * /etc/zsh/zshrc: check for $SUDO and do not use it when running
+    as root so we have the command in the zsh history.
+
+ -- Michael Prokop <mika@grml.org>  Sun, 13 May 2007 12:19:36 +0200
+
 grml-etc-core (0.2.53) unstable; urgency=low
 
   * Add /etc/skel/.emacs which enables UTF-8 mode by default.

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index 04b1cb2..d6b9938 100644 (file)
--- a/etc/zsh/zshrc
+++ b/etc/zsh/zshrc
@@ -696,12 +696,12 @@ Enjoy your grml system with the zsh!$reset_color"
     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 ati="$SUDO aptitude install"
-    alias ag="$SUDO apt-get upgrade"
-    alias au="$SUDO apt-get update"
-    alias up="$SUDO aptitude update ; $SUDO aptitude upgrade"
+    [ -n "$SUDO" ] && alias adg="$SUDO apt-get dist-upgrade" || alias adg="apt-get dist-upgrade"
+    [ -n "$SUDO" ] && alias agi="$SUDO apt-get install"      || alias agi="apt-get install"
+    [ -n "$SUDO" ] && alias ati="$SUDO aptitude install"     || alias ati="aptitude install"
+    [ -n "$SUDO" ] && alias ag="$SUDO apt-get upgrade"       || alias ag="apt-get upgrade"
+    [ -n "$SUDO" ] && alias au="$SUDO apt-get update"        || alias au="apt-get update"
+    [ -n "$SUDO" ] && alias up="$SUDO aptitude update ; $SUDO aptitude upgrade" || alias up="aptitude update ; aptitude upgrade"
     alias dbp='dpkg-buildpackage'
     alias ge='grep-excuses'