From 4adafbdb0096e3cee7c01a6871657d4ea34485a8 Mon Sep 17 00:00:00 2001 From: buanet Date: Sun, 24 Sep 2023 00:24:37 +0200 Subject: [PATCH] removed special settings for zwave #377 --- .github/workflows/build-debian12-beta.yml | 2 +- debian12/scripts/iobroker_startup.sh | 13 ------------- debian12/scripts/setup_zwave.sh | 17 ----------------- 3 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 debian12/scripts/setup_zwave.sh diff --git a/.github/workflows/build-debian12-beta.yml b/.github/workflows/build-debian12-beta.yml index 299c5ef..0e4b5fd 100644 --- a/.github/workflows/build-debian12-beta.yml +++ b/.github/workflows/build-debian12-beta.yml @@ -149,8 +149,8 @@ jobs: push: true platforms: | linux/amd64 - linux/arm/v7 linux/arm64/v8 +# linux/arm/v7 tags: | buanet/iobroker:beta-node${{ vars.EXPERIMENTAL_NODE_VERSION }}, buanet/iobroker:${{ env.version }}-node${{ vars.EXPERIMENTAL_NODE_VERSION }}, diff --git a/debian12/scripts/iobroker_startup.sh b/debian12/scripts/iobroker_startup.sh index e4f96e2..c8c9842 100644 --- a/debian12/scripts/iobroker_startup.sh +++ b/debian12/scripts/iobroker_startup.sh @@ -29,7 +29,6 @@ statesdbtype=$IOB_STATESDB_TYPE statesdbname=$IOB_STATESDB_NAME # new for sentinel support statesdbpass=$IOB_STATESDB_PASS # new for auth support usbdevices=$USBDEVICES -zwave=$ZWAVE set -u pkill_timeout=10 # timeout for iobroker shutdown in seconds @@ -104,7 +103,6 @@ if [[ "$permissioncheck" != "" ]]; then echo -n "----- " && e if [[ "$setgid" != "" ]]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" SETGID: "$setgid")" && echo " -----"; fi if [[ "$setuid" != "" ]]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" SETUID: "$setuid")" && echo " -----"; fi if [[ "$usbdevices" != "" ]]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" USBDEVICES: "$usbdevices")" && echo " -----"; fi -if [[ "$zwave" != "" ]]; then echo -n "----- " && echo -n "$(printf "%-20s %-28s" ZWAVE: "$zwave")" && echo " -----"; fi echo "$(printf -- '-%.0s' {1..80})" echo " " @@ -463,17 +461,6 @@ elif [[ "$avahi" = "true" ]]; then echo " " fi -# Checking ENV for Z-WAVE -if [[ "$zwave" = "true" && "$offlinemode" = "true" ]]; then - echo "ZWAVE is \"true\", but OFFLINE_MODE is also \"true\". Skipping Z-Wave setup." -elif [[ "$zwave" = "true" ]]; then - echo "ZWAVE is \"true\". Running setup script... " - chmod 755 /opt/scripts/setup_zwave.sh - bash /opt/scripts/setup_zwave.sh - echo "Done." - echo " " -fi - # checking ENV for USBDEVICES if [[ "$usbdevices" != "" && "$usbdevices" != "none" ]]; then echo "USBDEVICES is set." diff --git a/debian12/scripts/setup_zwave.sh b/debian12/scripts/setup_zwave.sh deleted file mode 100644 index 8efd62e..0000000 --- a/debian12/scripts/setup_zwave.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -if [ -e /usr/local/lib64 ] -then - echo "[setup_zwave.sh] Openzwave is already installed. Nothing to do here." -else - echo -n "[setup_zwave.sh] Openzwave is NOT installed. Going to install it now... " - cd /opt || exit - curl -s -L -O http://old.openzwave.com/downloads/openzwave-1.6.1007.tar.gz - tar -xf openzwave-1.6.1007.tar.gz && rm openzwave-1.6.1007.tar.gz - cd openzwave-1.6.1007 && make > /dev/null 2>&1 && make install > /dev/null 2>&1 - ldconfig /usr/local/lib64 - cd /opt/iobroker || exit - echo "Done." -fi - -exit 0