Fix further shell script weirdness (where do these come from?)

[config] / buster / setup_scripts / setup_eeepc.sh

diff --git a/buster/setup_scripts/setup_eeepc.sh b/buster/setup_scripts/setup_eeepc.sh
index 0ce0a96d48034362165a4345c60a23459b79b987..7b0323e80cf749ddfb02a63982c038cf5dff68e5 100755 (executable)
--- a/buster/setup_scripts/setup_eeepc.sh
+++ b/buster/setup_scripts/setup_eeepc.sh
@@ -7,6 +7,7 @@ if [ "$#" -ne 1 ]; then
 fi
 hostname="$1"
 
+# Set up system without user environment.
 config_tree_prefix="${HOME}/config/buster"
 setup_scripts_dir="${config_tree_prefix}/setup_scripts"
 cd "${setup_scripts_dir}"
@@ -14,8 +15,42 @@ cd "${setup_scripts_dir}"
 ./copy_dirtree.sh "${config_tree_prefix}/etc_files" "" eeepc
 ./install_for_target.sh eeepc
 
+# Install Firefox directly from Mozilla.
+url_firefox="https://ftp.mozilla.org/pub/firefox/releases/66.0/linux-x86_64/en-US/firefox-66.0.tar.bz2"
+wget "${url_firefox}"
+mv firefox-66.0.tar.bz2 /opt/
+cd /opt/
+tar xf firefox-66.0.tar.bz2
+rm firefox-66.0.tar.bz2
+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}"
+noscript_xpi="noscript-10.6.xpi"
+url_noscript="https://secure.informaction.com/download/releases/${noscript_xpi}"
+wget "${url_noscript}"
+name=$(unzip -p "${noscript_xpi}" manifest.json | jq -r .applications.gecko.id)
+mv "${noscript_xpi}" "${name}.xpi"
+tridactyl_xpi="tridactyl-1.14.9pre2457-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.
+cd "${setup_scripts_dir}"
+./copy_dirtree.sh "${config_tree_prefix}/home_files" "/root" minimal root
 if [ ! -d "/home/plom" ]; then
-    adduser --disabled-password --gecos plom
+    adduser --disabled-password --gecos "" plom
+    usermod -a -G sudo plom
     su -c "cd && git clone https://plomlompom.com/repos/clone/config" plom
-    su -c "~/config/buster/setup_scripts/copy_dirtree.sh ~/config/buster/home_files ~ eeepc" plom
+    su -c "~/config/buster/setup_scripts/copy_dirtree.sh ~/config/buster/home_files ~ minimal user_eeepc" plom
+    su -c "curl -fsSl https://raw.githubusercontent.com/tridactyl/tridactyl/78e662efefd1f4af2bdb2a53edecf03b535b997b/native/install.sh | bash" plom
+    passwd plom
+    echo "As tridactyl user, don't forget to do :source on the first Firefox run and then re-start."
 fi