Use vim.basic as alternative setting for vi

diff --git a/debian/changelog b/debian/changelog
index cfbe813..aadbe90 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,8 +29,9 @@ grml-live (0.9) unstable; urgency=low
   * Display progress of squashfs, when building via a buildsystem
     just set -no-progress in $SQUASHFS_OPTIONS instead.
   * Use linux-kernel-headers-grml in grml-medium.
   * Display progress of squashfs, when building via a buildsystem
     just set -no-progress in $SQUASHFS_OPTIONS instead.
   * Use linux-kernel-headers-grml in grml-medium.

+  * Use vim.basic as alternative setting for 'vi'.

 
 

- -- Michael Prokop <mika@grml.org>  Mon, 18 Aug 2008 00:03:14 +0200
+ -- Michael Prokop <mika@grml.org>  Mon, 25 Aug 2008 13:24:25 +0200

 
 grml-live (0.8) unstable; urgency=low
 
 
 grml-live (0.8) unstable; urgency=low
 

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index 33646d7..fb0912c 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -4,7 +4,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 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: Fri Dec 28 23:14:32 CET 2007 [mika]
+# Latest change: Mon Aug 25 13:24:20 CEST 2008 [mika]

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


@@ -12,10 +12,15 @@ set -e
 
 if [ -r $target/usr/bin/vim.basic ] ; then
    $ROOTCMD update-alternatives --set editor /usr/bin/vim.basic
 
 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
 
 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
 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
 fi
 
 if [ -r $target/usr/bin/uxterm ] ; then