Several updates for grml-small

[grml-live.git] / etc / grml / fai / config / scripts / GRMLBASE / 90-update-alternatives

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index a413a40..d67281f 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -4,22 +4,26 @@
 # 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.
 # 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 15:07:12 CEST 2008 [mika]
+# Latest change: Mon Sep 29 13:15:35 CEST 2008 [mika]

 ################################################################################
 
 set -u
 set -e
 
 ################################################################################
 
 set -u
 set -e
 

+## Editor:
+# Too many people don't expect to get that, so use it only for grml-small:
+if ifclass GRML_SMALL ; then
+   if [ -r $target/usr/bin/vim.tiny ] ; then
+      $ROOTCMD update-alternatives --set editor /usr/bin/vim.tiny
+      $ROOTCMD update-alternatives --set 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
 
 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/uxterm ] ; then
    $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/uxterm
 elif [ -r $target/usr/bin/xterm ] ; then
 if [ -r $target/usr/bin/uxterm ] ; then
    $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/uxterm
 elif [ -r $target/usr/bin/xterm ] ; then