Use Firefox as default browser if present and drop iceweasel config

[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 7b541f5..bc67650 100755 (executable)
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -14,19 +14,15 @@ if $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q vim.gtk ; th
   $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 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

 elif $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q vim.basic ; then
   echo "Setting vim.basic as editor using update-alternatives."
   $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
 elif $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q vim.basic ; then
   echo "Setting vim.basic as editor using update-alternatives."
   $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

 elif $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q vim.tiny ; then
   echo "Setting vim.tiny as editor using update-alternatives."
   $ROOTCMD update-alternatives --set editor /usr/bin/vim.tiny
   $ROOTCMD update-alternatives --set vi     /usr/bin/vim.tiny
 elif $ROOTCMD update-alternatives --list editor 2>/dev/null | grep -q vim.tiny ; then
   echo "Setting vim.tiny as editor using update-alternatives."
   $ROOTCMD update-alternatives --set editor /usr/bin/vim.tiny
   $ROOTCMD update-alternatives --set vi     /usr/bin/vim.tiny

-  $ROOTCMD update-alternatives --set vim    /usr/bin/vim.tiny
-  $ROOTCMD update-alternatives --set view   /usr/bin/vim.tiny

 else
   echo "Warning: No vim binary suitable for update-alternatives found."
 fi
 else
   echo "Warning: No vim binary suitable for update-alternatives found."
 fi


@@ -49,6 +45,11 @@ if $ROOTCMD update-alternatives --list x-www-browser 2>/dev/null | grep -q '/ice
   $ROOTCMD update-alternatives --set x-www-browser /usr/bin/iceweasel
 fi
 
   $ROOTCMD update-alternatives --set x-www-browser /usr/bin/iceweasel
 fi
 

+if $ROOTCMD update-alternatives --list x-www-browser 2>/dev/null | grep -q '/firefox-esr' ; then
+  echo "Setting firefox-esr as x-www-browser using update-alternatives."
+  $ROOTCMD update-alternatives --set x-www-browser /usr/bin/firefox-esr
+fi
+

 if $ROOTCMD update-alternatives --list www-browser 2>/dev/null | grep -q '/w3m' ; then
   echo "Setting w3m as www-browser using update-alternatives."
   $ROOTCMD update-alternatives --set www-browser /usr/bin/w3m
 if $ROOTCMD update-alternatives --list www-browser 2>/dev/null | grep -q '/w3m' ; then
   echo "Setting w3m as www-browser using update-alternatives."
   $ROOTCMD update-alternatives --set www-browser /usr/bin/w3m