X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=a194055ef67a8e29d0edce5e0e1dc0edc081fdf9;hp=fb0912c8c4ff901d9c388154355bc12fcf165e1c;hb=452816601c78128f1a021d8df426b229c0249a5b;hpb=b94641a1af46ddcf5aa03eafdb89834439768b12

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index fb0912c..a194055 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -4,25 +4,35 @@
 # 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 or any later version.
-# Latest change: Mon Aug 25 13:24:20 CEST 2008 [mika]
+# Latest change: Mon Sep 29 14:16:38 CEST 2008 [mika]
 ################################################################################
 
 set -u
 set -e
 
+## Editor:
+# Too many people don't expect to get that, so use it only for grml-small
+# avoid "debug: unbound variable":
+set +u
+if ifclass GRML_SMALL ; then
+set -u
+   if [ -r $target/usr/bin/vim.tiny ] ; then
+      # update-alternates does not work without /usr/share/man because
+      # it configures (in our case non-existent) manpages as well :-/
+      # $ROOTCMD update-alternatives --set editor /usr/bin/vim.tiny
+      # $ROOTCMD update-alternatives --set vi     /usr/bin/vim.tiny
+      $ROOTCMD ln -sf /usr/bin/editor /etc/alternatives/editor
+      $ROOTCMD ln -sf /etc/alternatives/editor /usr/bin/vim.tiny
+      $ROOTCMD ln -sf /usr/bin/vi /etc/alternatives/vi
+      $ROOTCMD ln -sf /etc/alternatives/vi /usr/bin/vim.tiny
+   fi
+fi
+
 if [ -r $target/usr/bin/vim.basic ] ; then
    $ROOTCMD update-alternatives --set editor /usr/bin/vim.basic
    $ROOTCMD update-alternatives --set vi     /usr/bin/vim.basic
 fi
 
-## Too many people don't expect to get that, so deactive by default:
-# if [ -r $target/usr/bin/vim.tiny ] ; then
-#    $ROOTCMD update-alternatives --set vi /usr/bin/vim.tiny
-# fi
-
-if [ -r $target/usr/bin/vim.tiny ] ; then
-fi
-
 if [ -r $target/usr/bin/uxterm ] ; then
    $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/uxterm
 elif [ -r $target/usr/bin/xterm ] ; then