From: Christian Heller <c.heller@plomlompom.de>
Date: Fri, 28 Jan 2022 18:09:33 +0000 (+0100)
Subject: Outsource Firefox setup to own script.
X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/conditions?a=commitdiff_plain;h=face141943fe110819bb443ddd7175dab58ee743;p=config

Outsource Firefox setup to own script.
---

diff --git a/bullseye/setup_scripts/setup_desktop.sh b/bullseye/setup_scripts/setup_desktop.sh
index ff01ce2..37a8e20 100755
--- a/bullseye/setup_scripts/setup_desktop.sh
+++ b/bullseye/setup_scripts/setup_desktop.sh
@@ -25,37 +25,6 @@ fi
 # lpadmin -p 'HP_Deskjet_F300_series' -m 'drv:///hpcups.drv/hp-deskjet_f300_series.ppd' -o 'OutputMode=NormalGray' -E
 # service cups restart
 
-# Install Firefox directly from Mozilla.
-firefox_release="91.5.0esr"
-firefox_filename="firefox-${firefox_release}.tar.bz2"
-url_firefox="https://ftp.mozilla.org/pub/firefox/releases/${firefox_release}/linux-x86_64/en-US/${firefox_filename}"
-wget "${url_firefox}"
-mv "${firefox_filename}" /opt/
-cd /opt/
-tar xf "${firefox_filename}"
-rm "${firefox_filename}"
-ln -s /opt/firefox/firefox /usr/local/bin/
-update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/firefox/firefox 200
-update-alternatives --set x-www-browser /opt/firefox/firefox
-
-# # Install Firefox plugins.
-# # See <https://developer.mozilla.org/en-US/docs/Mozilla/Add-ons/WebExtensions/Distribution_options/Sideloading_add-ons>
-# extensions_dir="/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/"
-# mkdir -p "${extensions_dir}"
-# ublock_version="1.40.8"
-# ublock_xpi="uBlock0_${ublock_version}.firefox.signed.xpi"
-# url_ublock="https://github.com/gorhill/uBlock/releases/download/${ublock_version}/${ublock_xpi}"
-# wget "${url_ublock}"
-# name=$(unzip -p "${ublock_xpi}" manifest.json | jq -r .applications.gecko.id)
-# mv "${ublock_xpi}" "${name}".xpi
-# tridactyl_version="1.22.0pre6103"
-# tridactyl_xpi="tridactyl_beta-${tridactyl_version}-an+fx.xpi"
-# url_tridactyl="https://tridactyl.cmcaine.co.uk/betas/${tridactyl_xpi}"
-# wget "${url_tridactyl}"
-# name=$(unzip -p "${tridactyl_xpi}" manifest.json | jq -r .applications.gecko.id)
-# mv "${tridactyl_xpi}" "${name}.xpi"
-# mv *.xpi "${extensions_dir}"
-
 # Set up user environments.
 secrets_dev="sdb"
 source_dir_secrets="/media/${secrets_dev}/to_usb"
diff --git a/bullseye/setup_scripts/setup_firefox.sh b/bullseye/setup_scripts/setup_firefox.sh
new file mode 100755
index 0000000..e229c89
--- /dev/null
+++ b/bullseye/setup_scripts/setup_firefox.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+set -e
+
+# Install Firefox directly from Mozilla.
+firefox_release="91.5.1esr"
+firefox_filename="firefox-${firefox_release}.tar.bz2"
+url_firefox="https://ftp.mozilla.org/pub/firefox/releases/${firefox_release}/linux-x86_64/en-US/${firefox_filename}"
+wget "${url_firefox}"
+mv "${firefox_filename}" /opt/
+cd /opt/
+tar xf "${firefox_filename}"
+rm "${firefox_filename}"
+ln -s /opt/firefox/firefox /usr/local/bin/
+update-alternatives --install /usr/bin/x-www-browser x-www-browser /opt/firefox/firefox 200
+update-alternatives --set x-www-browser /opt/firefox/firefox