X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=b28abdd69aac3fe236256b33b20bb17174b217f4;hb=e13f6a8e039735faf767a7fec63474d54b7c79b2;hp=fb0912c8c4ff901d9c388154355bc12fcf165e1c;hpb=b94641a1af46ddcf5aa03eafdb89834439768b12;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 fb0912c..b28abdd 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -1,45 +1,58 @@
-#!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+#!/bin/bash
+# Filename:      ${GRML_FAI_CONFIG}/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>
 # 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 13:24:20 CEST 2008 [mika]
 ################################################################################
 
 set -u
 set -e
 
 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 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
 
-## 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.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
-   $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/uxterm
+  $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/uxterm
 elif [ -r $target/usr/bin/xterm ] ; then
-   $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/xterm
+  $ROOTCMD update-alternatives --set x-terminal-emulator /usr/bin/xterm
 fi
 
 if [ -r $target/etc/X11/cursors/whiteglass.theme ] ; then
-   $ROOTCMD update-alternatives --set x-cursor-theme /etc/X11/cursors/whiteglass.theme
+  $ROOTCMD update-alternatives --set x-cursor-theme /etc/X11/cursors/whiteglass.theme
 fi
 
-if [ -r $target/usr/bin/iceweasel ] ; then
-   $ROOTCMD update-alternatives --set x-www-browser /usr/bin/iceweasel
+if [ -r $target/usr/bin/iceweasel ] || [ -L $target/usr/bin/iceweasel ] ; then
+  $ROOTCMD update-alternatives --set x-www-browser /usr/bin/iceweasel
 fi
 
 if [ -r $target/usr/bin/w3m ] ; then
-   $ROOTCMD update-alternatives --set www-browser /usr/bin/w3m
+  $ROOTCMD update-alternatives --set www-browser /usr/bin/w3m
+fi
+
+if [ -r $target/usr/bin/wm-ng ] ; then
+  # activate wm-ng only if it is registered as x-window-manager:
+  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 ] || [ -L $target/sbin/mount.ntfs-3g ] ; then
+  $ROOTCMD ln -sf /sbin/mount.ntfs-3g /sbin/mount.ntfs
 fi
 
 ## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3
+# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2