X-Git-Url: https://git.grml.org/?p=grml-live.git;a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F90-update-alternatives;h=5aff20d79513f786e3ffe9f3741424b3e92bddfe;hp=10a7e9184dc0aee9cba888976adc2cc5b444a7b3;hb=4b2e8632eba4fa2343986f897cfcd59ed1413d66;hpb=9246389e0b2f78cdc65ba9b3ba76b038b79d51c6 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives index 10a7e91..5aff20d 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives +++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives @@ -1,28 +1,30 @@ -#!/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 # Bug-Reports: see http://grml.org/bugs/ # License: This file is licensed under the GPL v2 or any later version. -# Latest change: Mon Sep 29 13:58:14 CEST 2008 [mika] ################################################################################ set -u set -e ## Editor: -# Too many people don't expect to get that, so use it only for grml-small: -# avoid "debug: unbound variable" +# Too many people don't expect to get that, so use it only for grml-small +# avoid "debug: unbound variable": set +u if ifclass GRML_SMALL ; then set -u 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 + # update-alternates does not work without /usr/share/man because + # it configures (in our case non-existent) manpages as well :-/ + # $ROOTCMD update-alternatives --set editor /usr/bin/vim.tiny + # $ROOTCMD update-alternatives --set vi /usr/bin/vim.tiny + $ROOTCMD ln -sf /etc/alternatives/editor /usr/bin/editor + $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 fi -else - # avoid "debug: unbound variable" for ifclass running with 'set -u' - true fi if [ -r $target/usr/bin/vim.basic ] ; then @@ -40,7 +42,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 @@ -48,5 +50,18 @@ if [ -r $target/usr/bin/w3m ] ; then $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 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