From: Darshaka Pathirana <dpat@syn-net.org>
Date: Fri, 5 May 2017 13:33:27 +0000 (+0200)
Subject: Use Firefox as default browser if present and drop iceweasel config
X-Git-Tag: v0.29.3~2
X-Git-Url: https://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=02f844a8e32745c0c925b8928196ad9b9a4c7cfc

Use Firefox as default browser if present and drop iceweasel config

The "Iceweasel Age"[1] has ended and we can use Firefox again and
therefore use firefox as x-www-browser.

Unfortunately overriding the default homepage via
/etc/iceweasel/profile/prefs.js does not work anymore therefor dropping
the iceweasel configuration. (See: grml/grml#18)

[1] https://lwn.net/Articles/676799/

Closes grml/grml#15
---

diff --git a/etc/grml/fai/config/files/etc/iceweasel/profile/prefs.js/GRML_FULL b/etc/grml/fai/config/files/etc/iceweasel/profile/prefs.js/GRML_FULL
deleted file mode 100644
index dd5fe1b..0000000
--- a/etc/grml/fai/config/files/etc/iceweasel/profile/prefs.js/GRML_FULL
+++ /dev/null
@@ -1,14 +0,0 @@
-# Mozilla User Preferences
-
-/* Do not edit this file.
- *
- * If you make changes to this file while the browser is running,
- * the changes will be overwritten when the browser exits.
- *
- * To make a manual change to preferences, you can visit the URL about:config
- * For more information, see http://www.mozilla.org/unix/customizing.html#prefs
- */
-
-/* Added by grml-live */
-user_pref("browser.startup.homepage","/usr/share/doc/grml-docs/startpage.html");
-
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
index 3d958e5..bc67650 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
+++ b/etc/grml/fai/config/scripts/GRMLBASE/90-update-alternatives
@@ -45,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
 
+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
diff --git a/etc/grml/fai/config/scripts/GRML_FULL/01-iceweasel b/etc/grml/fai/config/scripts/GRML_FULL/01-iceweasel
deleted file mode 100755
index 3603e57..0000000
--- a/etc/grml/fai/config/scripts/GRML_FULL/01-iceweasel
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRML_FULL/01-iceweasel
-# Purpose:       add startpage to Iceweasel
-# 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.
-################################################################################
-
-set -u
-set -e
-
-fcopy -B -v /etc/iceweasel/profile/prefs.js
-
-## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2