From: Christian Heller <c.heller@plomlompom.de>
Date: Thu, 13 Jan 2022 02:02:55 +0000 (+0100)
Subject: Fix desktop setup.
X-Git-Url: https://plomlompom.com/repos/%7B%7B%20web_path%20%7D%7D/%7B%7Bprefix%7D%7D/%7B%7Bdb.prefix%7D%7D/templates?a=commitdiff_plain;h=143c426c73a8690bd64e271843b712866d3298e1;p=config

Fix desktop setup.
---

diff --git a/bullseye/apt-mark/desktop b/bullseye/apt-mark/desktop
index 4935a3a..e0e913a 100644
--- a/bullseye/apt-mark/desktop
+++ b/bullseye/apt-mark/desktop
@@ -2,3 +2,5 @@
 grub-pc
 # needed by setup script
 wget
+unzip
+jq
diff --git a/bullseye/setup_scripts/setup_desktop.sh b/bullseye/setup_scripts/setup_desktop.sh
index 6f4754f..c45a6e4 100755
--- a/bullseye/setup_scripts/setup_desktop.sh
+++ b/bullseye/setup_scripts/setup_desktop.sh
@@ -43,7 +43,7 @@ update-alternatives --set x-www-browser /opt/firefox/firefox
 extensions_dir="/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/"
 mkdir -p "${extensions_dir}"
 ublock_version="1.40.8"
-ublock_xpi="$uBlock_0{ublock_version}.firefox.signed.xpi"
+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)