Move deCONZ install guard into deconz_setup and disable by default

Signed-off-by: Markus Schraufstetter <10926460+Markkuuss@users.noreply.github.com>

Author: Markkuuss

build-image/openhabian.conf

@@ -94,7 +94,7 @@ hotspotpw=openhabian
 # grottSetupEnabled=false
 
 # deCONZ settings (installs deCONZ; Phoscon Web UI + WebSocket API are provided by deCONZ)
-# deconz_install=enable
+deconz_install=disable
 # deconz_port=8081   # Phoscon Web UI (HTTP), default: 8081
 # deconz_wsport=8088 # deCONZ WebSocket API, default: 8088
 

docs/openhabian.md

@@ -556,7 +556,7 @@ hotspotpw="openhabian"
 
 #### `deconz_install`
 
-Enable unattended deCONZ software / Phoscon companion app installation.
+Enable or disable deCONZ software / Phoscon companion app installation.
 
 ::: details Example
 ```

functions/packages.bash

@@ -685,6 +685,11 @@ deconz_setup() {
   local successText=""
   local repo="/etc/apt/sources.list.d/deconz.list"
 
+  if [[ -n "$UNATTENDED" ]] && [[ "${deconz_install:-enable}" == "disable" ]]; then
+    echo -n "$(timestamp) [openHABian] Skipping deCONZ install as requested."
+    return 1
+  fi
+
   if [[ -n $INTERACTIVE ]]; then
     if ! (whiptail --title "deCONZ installation" --yes-button "Continue" --no-button "Cancel" --yesno "$introText" 11 80); then return 0; fi
   fi

openhabian-setup.sh

@@ -125,10 +125,7 @@ if [[ -n "$UNATTENDED" ]]; then
   exim_setup
   nut_setup
   install_grott "install"
-  # Install deCONZ (provides Phoscon Web UI + WebSocket API) when enabled
-  if [[ "${deconz_install}" == "enable" ]]; then
-    deconz_setup "${deconz_port}" "${deconz_wsport}"
-  fi
+  deconz_setup "${deconz_port}" "${deconz_wsport}"
   permissions_corrections
   setup_mirror_SD "install"
   install_cleanup