From f2c1e3dda59d2e2b96fd51fcafd1809fbf02f6f2 Mon Sep 17 00:00:00 2001 From: andre <> Date: Tue, 4 Feb 2020 22:07:04 +0100 Subject: [PATCH] testing --- amd64/Dockerfile | 4 ++-- amd64/scripts/iobroker_startup.sh | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/amd64/Dockerfile b/amd64/Dockerfile index fd6a9b8..4f455f7 100644 --- a/amd64/Dockerfile +++ b/amd64/Dockerfile @@ -1,6 +1,6 @@ FROM debian:stretch -LABEL maintainer="Andre Germann" \ +LABEL maintainer="Andre Germann" \ url="" ENV DEBIAN_FRONTEND noninteractive @@ -96,6 +96,6 @@ ENV AVAHI="false" \ TZ="Europe/Berlin" \ USBDEVICES="none" \ ZWAVE="false" - + # Run startup-script ENTRYPOINT ["/bin/bash", "-c", "/opt/scripts/iobroker_startup.sh"] diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh index 2cbd995..41db3f8 100644 --- a/amd64/scripts/iobroker_startup.sh +++ b/amd64/scripts/iobroker_startup.sh @@ -15,7 +15,7 @@ uid=$SETUID usbdevices=$USBDEVICES zwave=$ZWAVE -# Getting date and time for logging +# Getting date and time for logging dati=`date '+%Y-%m-%d %H:%M:%S'` # Logging header @@ -77,7 +77,7 @@ echo ' ' # Checking and setting uid/gid if [ $(cat /etc/group | grep 'iobroker:' | cut -d':' -f3) != $gid ] || [ $(cat /etc/passwd | grep 'iobroker:' | cut -d':' -f3) != $uid ] -then +then echo "Different UID and/ or GID is set by ENV." echo "Changing UID to "$uid" and GID to "$gid"..." usermod -u $uid iobroker @@ -142,7 +142,7 @@ echo "----- Step 3 of 5: Checking ioBroker installation -----" echo "$(printf -- '-%.0s' {1..60})" echo ' ' -# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts" +# (Re)Setting permissions to "/opt/iobroker" and "/opt/scripts" echo "(Re)Setting folder permissions (This might take a while! Please be patient!)..." chown -R $uid:$gid /opt/iobroker chown -R $uid:$gid /opt/scripts @@ -222,7 +222,7 @@ fi if [ "$usbdevices" != "none" ] then echo "Usb-device-support is activated by ENV." - + IFS=';' read -ra devicearray <<< "$usbdevices" for i in "${devicearray[@]}" do