fix hotspot offline setup

Signed-off-by: Markus Storm <[email protected]>

build-image/offline-install-modifications.bash

@@ -4,20 +4,23 @@
 export BASEDIR="/opt/openhabian"
 export DEBIAN_FRONTEND="noninteractive"
 export PREOFFLINE="1"
-comitupurl=https://davesteele.github.io/comitup/deb/
-comitupfile=davesteele-comitup-apt-source_1.2_all.deb
-comituprepofile=/etc/apt/sources.d/comitup.list
+debfileurl="https://davesteele.github.io/comitup/deb"
+debfile="davesteele-comitup-apt-source"
+debfilelatest="latest.deb"
+debfilestatic="1.2_all.deb"
+comituprepofile=/etc/apt/sources.d/davesteele-comitup.list
 
-source /opt/openhabian/functions/helpers.bash
+#source /opt/openhabian/functions/helpers.bash
+source functions/helpers.bash
 add_keys "https://openhab.jfrog.io/artifactory/api/gpg/key/public" "openhab"
 echo "deb [signed-by=/usr/share/keyrings/openhab.gpg] https://openhab.jfrog.io/artifactory/openhab-linuxpkg stable main" > /etc/apt/sources.list.d/openhab.list
 
 # comitup hotspot
-wget -nv "${comitupurl}/$comitupfile"
-dpkg -i --force-all "$comitupfile"
-rm -f "$comitupfile"
+wget -nv "${debfileurl}/${debfile}_${debfilelatest}" || wget -nv "${debfileurl}/${debfile}_${debfilestatic}"
+dpkg -i --force-all "${debfile}*.deb"
+rm -f "$${debfile}*.deb"
 if [[ ! -f ${comituprepofile} ]]; then
-  echo "deb http://davesteele.github.io/comitup/repo comitup main" > $comituprepofile
+  echo "deb [signed-by=/usr/share/keyrings/davesteele-archive-keyring.gpg] http://davesteele.github.io/comitup/repo comitup main" > $comituprepofile
 fi
 
 # tailscale VPN