Move vim vs. vi from /etc/skel/.zshrc.grmlsmall to /etc/zsh/zshrc

diff --git a/debian/changelog b/debian/changelog
index bb3d202..a374e10 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-etc-core (0.3.39) unstable; urgency=low
+
+  * Move vim vs. vi from /etc/skel/.zshrc.grmlsmall to /etc/zsh/zshrc
+    to make sure it's also fixed for user root.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 05 Nov 2007 12:20:44 +0100
+
 grml-etc-core (0.3.38) unstable; urgency=low
 
   * Provide e* functions in /etc/grml/lsb-functions again

diff --git a/etc/skel/.zshrc.grmlsmall b/etc/skel/.zshrc.grmlsmall
index 25eca4c..7bd3c11 100644 (file)
--- a/etc/skel/.zshrc.grmlsmall
+++ b/etc/skel/.zshrc.grmlsmall
@@ -4,11 +4,9 @@
 # Authors:       Frank Terbeck <ft@bewatermyfriend.de>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2.
-# Latest change: Mit Nov 15 21:31:18 CET 2006 [ft]
+# Latest change: Mon Nov 05 12:20:27 CET 2007 [mika]
 ################################################################################
 
-# vim is not in grmlsmall
-  [[ $EDITOR == vim ]] && EDITOR='vi'
   unset abk[V]
   unalias    'V'      &> /dev/null
   unfunction vman     &> /dev/null

diff --git a/etc/zsh/zshrc b/etc/zsh/zshrc
index ba0df24..f87f59a 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: Don Okt 18 10:22:10 CEST 2007 [mika]
+# Latest change: Mon Nov 05 12:20:29 CET 2007 [mika]
 ################################################################################
 # This file is sourced only for interactive shells. It
 # should contain commands to set up aliases, functions,
@@ -231,7 +231,11 @@
 
 # {{{ set some variables
   #v#
-  export EDITOR=${EDITOR:-vim}
+  if type -p vim &>/dev/null ; then
+     export EDITOR=${EDITOR:-vim}
+  else
+     export EDITOR=${EDITOR:-vi}
+  fi
   #v#
   export MAIL=${MAIL:-/var/mail/$USER}
   # if we don't set $SHELL then aterm, rxvt,.. will use /bin/sh or /bin/bash :-/