X-Git-Url: https://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=e64a7c9b0a463f076e70766edbedad1f313e3a3b;hb=5f5abbc3194cce210e20cc2f9142da649552adff;hp=33646d71c1873f7ed051a5e6f75fea496f84d012;hpb=f9b8a344c4f45000a63b3288ea2cfff1b7508c1c;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index 33646d7..e64a7c9 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -4,18 +4,33 @@
 # 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: Fri Dec 28 23:14:32 CET 2007 [mika]
+# Latest change: Mon Sep 29 14:16:38 CEST 2008 [mika]
 ################################################################################
 
 set -u
 set -e
 
-if [ -r $target/usr/bin/vim.basic ] ; then
-   $ROOTCMD update-alternatives --set editor /usr/bin/vim.basic
+## 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 /etc/alternatives/editor /usr/bin/editor
+      $ROOTCMD ln -sf /usr/bin/vim.tiny /etc/alternatives/editor 
+      $ROOTCMD ln -sf /etc/alternatives/vi /usr/bin/vi
+      $ROOTCMD ln -sf /usr/bin/vim.tiny /etc/alternatives/vi 
+   fi
 fi
 
-if [ -r $target/usr/bin/vim.tiny ] ; then
-   $ROOTCMD update-alternatives --set vi /usr/bin/vim.tiny
+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
 
 if [ -r $target/usr/bin/uxterm ] ; then