From: Christian Hofstaedtler <ch@grml.org>
Date: Thu, 26 May 2011 19:45:15 +0000 (+0200)
Subject: Sync vi,vim,view,editor alternatives
X-Git-Tag: v0.14.1~4
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=4fd4ee2327db1cd93c79fca3cd3de1adef187544

Sync vi,vim,view,editor alternatives

Also use vim.gtk when it's available (this does not depend on X
running).
---

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index 56a365e..b564477 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -24,12 +24,25 @@ set -u
       $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
+      $ROOTCMD ln -sf /etc/alternatives/vim /usr/bin/vim
+      $ROOTCMD ln -sf /usr/bin/vim.tiny /etc/alternatives/vim
+      $ROOTCMD ln -sf /etc/alternatives/view /usr/bin/view
+      $ROOTCMD ln -sf /usr/bin/vim.tiny /etc/alternatives/view
    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
+   $ROOTCMD update-alternatives --set vim    /usr/bin/vim.basic
+   $ROOTCMD update-alternatives --set view   /usr/bin/vim.basic
+fi
+
+if [ -r $target/usr/bin/vim.gtk ] ; then
+   $ROOTCMD update-alternatives --set editor /usr/bin/vim.gtk
+   $ROOTCMD update-alternatives --set vi     /usr/bin/vim.gtk
+   $ROOTCMD update-alternatives --set vim    /usr/bin/vim.gtk
+   $ROOTCMD update-alternatives --set view   /usr/bin/vim.gtk
 fi
 
 if [ -r $target/usr/bin/uxterm ] ; then