Sync vi,vim,view,editor alternatives

[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 bf1f11e..b564477 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # Filename:      /etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
 # Purpose:       set up /etc/alternatives/* according to grml preferences
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
@@ -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
@@ -42,7 +55,7 @@ if [ -r $target/etc/X11/cursors/whiteglass.theme ] ; then
    $ROOTCMD update-alternatives --set x-cursor-theme /etc/X11/cursors/whiteglass.theme
 fi
 
-if [ -r $target/usr/bin/iceweasel ] ; then
+if [ -r $target/usr/bin/iceweasel ] || [ -L $target/usr/bin/iceweasel ] ; then
    $ROOTCMD update-alternatives --set x-www-browser /usr/bin/iceweasel
 fi
 
@@ -52,15 +65,15 @@ fi
 
 if [ -r $target/usr/bin/wm-ng ] ; then
    # activate wm-ng only if it is registered as x-window-manager:
-   if update-alternatives --list x-window-manager | grep -q wm-ng ; then
+   if $ROOTCMD update-alternatives --list x-window-manager | grep -q wm-ng ; then
      $ROOTCMD update-alternatives --set x-window-manager /usr/bin/wm-ng
    fi
 fi
 
 # sadly isn't available via update-alternates, anyway - use
 # ntfs-3g (if available) as default for ntfs
-if [ -r $target/sbin/mount.ntfs-3g ] ; then
-   $ROOTCMD ln -s /sbin/mount.ntfs-3g /sbin/mount.ntfs
+if [ -r $target/sbin/mount.ntfs-3g ] || [ -L $target/sbin/mount.ntfs-3g ] ; then
+   $ROOTCMD ln -sf /sbin/mount.ntfs-3g /sbin/mount.ntfs
 fi
 
 ## END OF FILE #################################################################