removed special settings for zwave #377

This commit is contained in:
buanet
2023-09-24 00:24:37 +02:00
parent 837064f86b
commit 4adafbdb00
3 changed files with 1 additions and 31 deletions

View File

@@ -149,8 +149,8 @@ jobs:
push: true push: true
platforms: | platforms: |
linux/amd64 linux/amd64
linux/arm/v7
linux/arm64/v8 linux/arm64/v8
# linux/arm/v7
tags: | tags: |
buanet/iobroker:beta-node${{ vars.EXPERIMENTAL_NODE_VERSION }}, buanet/iobroker:beta-node${{ vars.EXPERIMENTAL_NODE_VERSION }},
buanet/iobroker:${{ env.version }}-node${{ vars.EXPERIMENTAL_NODE_VERSION }}, buanet/iobroker:${{ env.version }}-node${{ vars.EXPERIMENTAL_NODE_VERSION }},

View File

@@ -29,7 +29,6 @@ statesdbtype=$IOB_STATESDB_TYPE
statesdbname=$IOB_STATESDB_NAME # new for sentinel support statesdbname=$IOB_STATESDB_NAME # new for sentinel support
statesdbpass=$IOB_STATESDB_PASS # new for auth support statesdbpass=$IOB_STATESDB_PASS # new for auth support
usbdevices=$USBDEVICES usbdevices=$USBDEVICES
zwave=$ZWAVE
set -u set -u
pkill_timeout=10 # timeout for iobroker shutdown in seconds 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 [[ "$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 [[ "$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 [[ "$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 "$(printf -- '-%.0s' {1..80})"
echo " " echo " "
@@ -463,17 +461,6 @@ elif [[ "$avahi" = "true" ]]; then
echo " " echo " "
fi 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 # checking ENV for USBDEVICES
if [[ "$usbdevices" != "" && "$usbdevices" != "none" ]]; then if [[ "$usbdevices" != "" && "$usbdevices" != "none" ]]; then
echo "USBDEVICES is set." echo "USBDEVICES is set."

View File

@@ -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