install/omada-install.sh

@@ -22,9 +22,9 @@ $STD apt-get install -y jsvc
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Azul Zulu"
-wget -qO /etc/apt/trusted.gpg.d/zulu-repo.asc "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xB1998361219BD9C9"
+$STD apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9
 wget -q https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb
-$STD dpkg -i zulu-repo_1.0.0-3_all.deb
+$STD apt-get install ./zulu-repo_1.0.0-3_all.deb
 $STD apt-get update
 $STD apt-get -y install zulu8-jdk
 msg_ok "Installed Azul Zulu"
@@ -45,7 +45,7 @@ motd_ssh
 customize
 
 msg_info "Cleaning up"
-rm -rf Omada_SDN_Controller_v5.9.31_Linux_x64.deb mongodb-org-server_3.6.23_amd64.deb zulu-repo_1.0.0-3_all.deb libssl1.1_1.1.1f-1ubuntu2.19_amd64.deb
+rm -f Omada_SDN_Controller_v5.9.31_Linux_x64.deb mongodb-org-server_3.6.23_amd64.deb zulu-repo_1.0.0-3_all.deb libssl1.1_1.1.1f-1ubuntu2.19_amd64.deb
 $STD apt-get autoremove
 $STD apt-get autoclean
 msg_ok "Cleaned"

install/openhab-install.sh

@@ -22,9 +22,9 @@ $STD apt-get install -y apt-transport-https
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Azul Zulu"
-wget -qO /etc/apt/trusted.gpg.d/zulu-repo.asc "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xB1998361219BD9C9"
+$STD apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 0xB1998361219BD9C9
 wget -q https://cdn.azul.com/zulu/bin/zulu-repo_1.0.0-3_all.deb
-$STD dpkg -i zulu-repo_1.0.0-3_all.deb
+$STD apt-get install ./zulu-repo_1.0.0-3_all.deb
 $STD apt-get update
 $STD apt-get -y install zulu11-jdk
 msg_ok "Installed Azul Zulu"
@@ -33,11 +33,11 @@ msg_info "Installing openHAB"
 curl -fsSL "https://openhab.jfrog.io/artifactory/api/gpg/key/public" | gpg --dearmor >openhab.gpg
 mv openhab.gpg /usr/share/keyrings
 chmod u=rw,g=r,o=r /usr/share/keyrings/openhab.gpg
-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
+sudo sh -c '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'
 $STD apt update
 $STD apt-get -y install openhab
 systemctl daemon-reload
-systemctl enable -q --now openhab.service
+$STD systemctl enable --now openhab.service
 msg_ok "Installed openHAB"
 
 motd_ssh

install/scrypted-install.sh

@@ -83,8 +83,8 @@ msg_ok "Installed Python3 Dependencies"
 read -r -p "Would you like to add Coral Edge TPU support? <y/N> " prompt
 if [[ "${prompt,,}" =~ ^(y|yes)$ ]]; then
 msg_info "Adding Coral Edge TPU Support"
-wget -qO /etc/apt/trusted.gpg.d/coral-repo.asc "https://packages.cloud.google.com/apt/doc/apt-key.gpg"
-echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" >/etc/apt/sources.list.d/coral-edgetpu.list
+$STD apt-key add <(curl -fsSL https://packages.cloud.google.com/apt/doc/apt-key.gpg)
+sh -c 'echo "deb https://packages.cloud.google.com/apt coral-edgetpu-stable main" > /etc/apt/sources.list.d/coral-edgetpu.list'
 $STD apt-get -y update
 $STD apt-get -y install libedgetpu1-std
 msg_ok "Coral Edge TPU Support Added"

install/sonarr-install.sh

@@ -22,7 +22,7 @@ $STD apt-get install -y ca-certificates
 msg_ok "Installed Dependencies"
 
 msg_info "Installing Sonarr"
-wget -qO /etc/apt/trusted.gpg.d/sonarr-repo.asc "https://keyserver.ubuntu.com/pks/lookup?op=get&search=0x2009837cbffd68f45bc180471f4f90de2a9b4bf8"
+$STD apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 2009837CBFFD68F45BC180471F4F90DE2A9B4BF8
 echo "deb https://apt.sonarr.tv/debian testing-main main" >/etc/apt/sources.list.d/sonarr.list
 $STD apt-get update
 DEBIAN_FRONTEND=noninteractive apt-get -o Dpkg::Options::="--force-confold" install -qqy sonarr &>/dev/null