From 35e2b47302ea39d7abedbea80b98f24349175290 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Sun, 19 Sep 2021 20:21:03 +0200 Subject: [PATCH] Fix GH (#153) --- README.md | 40 ++++++++++++++++++++-------------------- debian-software | 8 +------- 2 files changed, 21 insertions(+), 27 deletions(-) diff --git a/README.md b/README.md index 3bc0345..e51e0d5 100644 --- a/README.md +++ b/README.md @@ -81,25 +81,25 @@ Development version: # Software testings -|Application name|Buster|Stretch*|Bionic*|Test install| -|:--|:--:|:--:|:--:|--:| -|TV headend (IPTV server)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|15.11.2020| -|Syncthing (personal cloud)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|15.11.2020| -|SoftEther VPN server (VPN server)|:grey_question:|:heavy_check_mark:|:heavy_check_mark:|09.03.2019| -|Plex (Plex media server)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|15.07.2019| -|Emby (Emby server)|:heavy_check_mark:|:heavy_check_mark:|:grey_question:|24.07.2019| -|Radarr (Movie downloading server)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|10.06.2019| -|Sonarr (TV shows downloading server)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|10.06.2019| -|Transmission (torrent server)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|10.06.2019| -|ISPConfig (WEB, SMTP, POP, IMAP, FTPD, MYSQL server)|:grey_question:|:heavy_check_mark:|:heavy_check_mark:|29.09.2018| -|NCP (Nextcloud personal cloud)|:grey_question:|:heavy_check_mark:|n/a|19.05.2019| -|OpenMediaVault NAS (NAS server)|:heavy_check_mark:|:heavy_check_mark:|n/a|24.07.2019| -|OpenHAB2 (Smarthome suite)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|17.12.2019| -|Home Assistant (Smarthome suite within Docker)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|09.03.2019| -|PI hole (ad blocker)|:grey_question:|:heavy_check_mark:|:heavy_check_mark:|09.03.2019| -|UrBackup (client/server backup system)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|10.06.2019| -|Docker (Docker CE engine)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|10.06.2019| -|Mayan EDMS (Document management system within Docker)|:grey_question:|:heavy_check_mark:|:heavy_check_mark:|29.09.2018| -|MiniDLNA (Media sharing)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|10.06.2019| +|Application name|Buster|Stretch*|Bionic*|Focal|Test install| +|:--|:--:|:--:|:--:|:--:|--:| +|TV headend (IPTV server)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:||15.11.2020| +|Syncthing (personal cloud)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:||15.11.2020| +|SoftEther VPN server (VPN server)|:grey_question:|:heavy_check_mark:|:heavy_check_mark:||09.03.2019| +|Plex (Plex media server)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:||15.07.2019| +|Emby (Emby server)|:heavy_check_mark:|:heavy_check_mark:|:grey_question:||24.07.2019| +|Radarr (Movie downloading server)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:||10.06.2019| +|Sonarr (TV shows downloading server)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:||10.06.2019| +|Transmission (torrent server)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:||10.06.2019| +|ISPConfig (WEB, SMTP, POP, IMAP, FTPD, MYSQL server)|:grey_question:|:heavy_check_mark:|:heavy_check_mark:||29.09.2018| +|NCP (Nextcloud personal cloud)|:grey_question:|:heavy_check_mark:|n/a||19.05.2019| +|OpenMediaVault NAS (NAS server)|:heavy_check_mark:|:heavy_check_mark:|n/a||24.07.2019| +|OpenHAB (Smarthome suite)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:|19.9.2021| +|Home Assistant (Smarthome suite within Docker)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:||09.03.2019| +|PI hole (ad blocker)|:grey_question:|:heavy_check_mark:|:heavy_check_mark:||09.03.2019| +|UrBackup (client/server backup system)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:||10.06.2019| +|Docker (Docker CE engine)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:||10.06.2019| +|Mayan EDMS (Document management system within Docker)|:grey_question:|:heavy_check_mark:|:heavy_check_mark:||29.09.2018| +|MiniDLNA (Media sharing)|:heavy_check_mark:|:heavy_check_mark:|:heavy_check_mark:||10.06.2019| \* no longer supported diff --git a/debian-software b/debian-software index ec248af..162311c 100755 --- a/debian-software +++ b/debian-software @@ -812,7 +812,6 @@ case $jdkArch in URL="https://cdn.azul.com/zulu/bin/zulu11.43.55-ca-jdk11.0.9.1-linux_i686.tar.gz" esac - fancy_wget "$URL" "-O ${TEMP_DIR}/zulu11.tar.gz" mkdir -p /opt/jdk tar -xpzf ${TEMP_DIR}/zulu11.tar.gz -C /opt/jdk @@ -1692,12 +1691,7 @@ if ! is_package_manager_running; then selection=${selection//Hassio/} fi - if [[ "$selection" == *OpenHAB2 && "$OPENHAB2_STATUS" != "on" ]]; then - install_openhab2 - selection=${selection//OpenHAB2/} - fi - - if [[ "$selection" == *OpenHAB3 && "$OPENHAB_STATUS" != "on" ]]; then + if [[ "$selection" == *OpenHAB && "$OPENHAB_STATUS" != "on" ]]; then install_openhab selection=${selection//OpenHAB/} fi