Update deconz-install.sh

tweak

ct/audiobookshelf.sh

@@ -23,7 +23,7 @@ var_disk="4"
 var_cpu="2"
 var_ram="2048"
 var_os="debian"
-var_version="11"
+var_version="12"
 variables
 color
 catch_errors

ct/deconz.sh

@@ -22,8 +22,8 @@ APP="deCONZ"
 var_disk="4"
 var_cpu="2"
 var_ram="1024"
-var_os="ubuntu"
+var_os="debian"
-var_version="20.04"
+var_version="12"
 variables
 color
 catch_errors

install/audiobookshelf-install.sh

@@ -21,8 +21,8 @@ $STD apt-get install -y mc
 msg_ok "Installed Dependencies"
 
 msg_info "Installing audiobookshelf"
-$STD apt-key add <(curl -s --compressed "https://advplyr.github.io/audiobookshelf-ppa/KEY.gpg")
+curl -fsSL https://advplyr.github.io/audiobookshelf-ppa/KEY.gpg >/etc/apt/trusted.gpg.d/audiobookshelf-ppa.asc
-sh -c 'echo "deb https://advplyr.github.io/audiobookshelf-ppa ./" > /etc/apt/sources.list.d/audiobookshelf.list'
+echo "deb [signed-by=/etc/apt/trusted.gpg.d/audiobookshelf-ppa.asc] https://advplyr.github.io/audiobookshelf-ppa ./" >/etc/apt/sources.list.d/audiobookshelf.list
 $STD apt-get update
 $STD apt install audiobookshelf
 msg_ok "Installed audiobookshelf"

install/deconz-install.sh

@@ -17,22 +17,24 @@ msg_info "Installing Dependencies"
 $STD apt-get install -y curl
 $STD apt-get install -y sudo
 $STD apt-get install -y mc
-$STD apt-get install -y gnupg
 msg_ok "Installed Dependencies"
 
 msg_info "Setting Phoscon Repository"
-$STD apt-key add <(curl -fsSL http://phoscon.de/apt/deconz.pub.key)
+VERSION="$(awk -F'=' '/^VERSION_CODENAME=/{ print $NF }' /etc/os-release)"
-sh -c "echo 'deb [arch=amd64] http://phoscon.de/apt/deconz $(lsb_release -cs) main' > /etc/apt/sources.list.d/deconz.list"
+curl -fsSL http://phoscon.de/apt/deconz.pub.key >/etc/apt/trusted.gpg.d/deconz.pub.asc
+echo "deb [arch=amd64] http://phoscon.de/apt/deconz $VERSION main" >/etc/apt/sources.list.d/deconz.list
 msg_ok "Setup Phoscon Repository"
 
 msg_info "Installing deConz"
+wget -qL http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2.19_amd64.deb
+$STD dpkg -i libssl1.1_1.1.1f-1ubuntu2.19_amd64.deb
 $STD apt-get update
 $STD apt-get install -y deconz
 msg_ok "Installed deConz"
 
 msg_info "Creating Service"
-service_path="/lib/systemd/system/deconz.service"
+cat <<EOF >/lib/systemd/system/deconz.service
-echo "[Unit]
+[Unit]
 Description=deCONZ: ZigBee gateway -- REST API
 Wants=deconz-init.service deconz-update.service
 StartLimitIntervalSec=0
@@ -45,14 +47,16 @@ RestartSec=30
 AmbientCapabilities=CAP_NET_BIND_SERVICE CAP_KILL CAP_SYS_BOOT CAP_SYS_TIME
 
 [Install]
-WantedBy=multi-user.target" >$service_path
+WantedBy=multi-user.target
-$STD systemctl enable --now deconz
+EOF
+systemctl enable -q --now deconz
 msg_ok "Created Service"
 
 motd_ssh
 customize
 
 msg_info "Cleaning up"
+rm -rf libssl1.1_1.1.1f-1ubuntu2.19_amd64.deb
 $STD apt-get autoremove
 $STD apt-get autoclean
 msg_ok "Cleaned"