From 8fc65e05df896102681c8cc4303ddf4f1ba8d9c4 Mon Sep 17 00:00:00 2001
From: andre <>
Date: Wed, 29 Jul 2020 22:20:45 +0200
Subject: [PATCH] directory changes

---
 aarch64/Dockerfile                  |  6 +++---
 aarch64/scripts/healthcheck.sh      |  4 ++--
 aarch64/scripts/iobroker_startup.sh | 24 ++++++++++++------------
 aarch64/scripts/maintenance.sh      |  8 ++++----
 amd64/Dockerfile                    |  6 +++---
 amd64/scripts/healthcheck.sh        |  4 ++--
 amd64/scripts/iobroker_startup.sh   | 24 ++++++++++++------------
 amd64/scripts/maintenance.sh        |  8 ++++----
 armv7hf/Dockerfile                  |  6 +++---
 armv7hf/scripts/healthcheck.sh      |  4 ++--
 armv7hf/scripts/iobroker_startup.sh | 24 ++++++++++++------------
 armv7hf/scripts/maintenance.sh      |  8 ++++----
 12 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 0997914..fbe6c1c 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -66,9 +66,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 WORKDIR /
 RUN apt-get update \
     && curl -sL https://iobroker.net/install.sh | bash - \
-    && mkdir -p /opt/iobroker/.docker_config/ \
-    && echo $(hostname) > /opt/iobroker/.docker_config/.install_host \
-    && echo "starting" > /opt/iobroker/.docker_config/.healthcheck \
+    && mkdir -p /opt/scripts/.docker_config/ \
+    && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
+    && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/aarch64/scripts/healthcheck.sh b/aarch64/scripts/healthcheck.sh
index dd7253e..072f9c0 100644
--- a/aarch64/scripts/healthcheck.sh
+++ b/aarch64/scripts/healthcheck.sh
@@ -2,11 +2,11 @@
 
 # Script checks health of running container
 
-if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ]
+if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
 then
   echo 'Health status: OK - Startup script is still running.'
   exit 0
-elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
+elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
 then
   echo 'Health status: OK - Container is running in maintenance mode.'
   exit 0
diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index 03e852b..c4bdf08 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Setting healthcheck status to "starting"
-echo "starting" > /opt/iobroker/.docker_config/.healthcheck
+echo "starting" > /opt/scripts/.docker_config/.healthcheck
 
 # Reading ENV
 adminport=$IOB_ADMINPORT
@@ -19,21 +19,21 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
+# Writing necessary ENVs to /opt/scripts/.docker_config/container.config for using it in other scripts
 
-echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
-echo ' ' >> /opt/iobroker/.docker_config/container.config
+echo '# Simple config file to store ENVs' > /opt/scripts/.docker_config/container.config
+echo ' ' >> /opt/scripts/.docker_config/container.config
 if [ "$multihost" = "" ]
 then
-  echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=master" >> /opt/scripts/.docker_config/container.config
 else
-  echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=$multihost" >> /opt/scripts/.docker_config/container.config
 fi
 if [ "$adminport" = "" ]
 then
-  echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=8081" >> /opt/scripts/.docker_config/container.config
 else
-  echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=$adminport" >> /opt/scripts/.docker_config/container.config
 fi
 
 # Getting date and time for logging
@@ -200,12 +200,12 @@ echo "Done."
 echo ' '
 
 # Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/iobroker/.docker_config/.install_host ]
+if [ -f /opt/scripts/.docker_config/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host)
-    rm -f /opt/iobroker/.docker_config/.install_host
+    bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
+    rm -f /opt/scripts/.docker_config/.install_host
   echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
@@ -498,7 +498,7 @@ echo "Starting ioBroker..."
 echo ' '
 
 # Setting healthcheck status to "running"
-echo "running" > /opt/iobroker/.docker_config/.healthcheck
+echo "running" > /opt/scripts/.docker_config/.healthcheck
 
 # Function for graceful shutdown by SIGTERM signal
 shut_down() {
diff --git a/aarch64/scripts/maintenance.sh b/aarch64/scripts/maintenance.sh
index 0ece4a0..4f77980 100644
--- a/aarch64/scripts/maintenance.sh
+++ b/aarch64/scripts/maintenance.sh
@@ -2,11 +2,11 @@
 
 if [ "$1" == "status" ]
 then
-  if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ]
+  if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
   then
     echo 'Maintenance mode is ON.'
     exit 0
-  elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ]
+  elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
   then
     echo 'Maintenance mode is OFF.'
     exit 0
@@ -18,7 +18,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Activating maintenance mode...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     sleep 1
     echo 'Done.'
     echo 'Stopping ioBroker...'
@@ -37,7 +37,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     pkill -u root
     exit 0
   else
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 0c0e5ee..c32b42b 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -66,9 +66,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 WORKDIR /
 RUN apt-get update \
     && curl -sL https://iobroker.net/install.sh | bash - \
-    && mkdir -p /opt/iobroker/.docker_config/ \
-    && echo $(hostname) > /opt/iobroker/.docker_config/.install_host \
-    && echo "starting" > /opt/iobroker/.docker_config/.healthcheck \
+    && mkdir -p /opt/scripts/.docker_config/ \
+    && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
+    && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/amd64/scripts/healthcheck.sh b/amd64/scripts/healthcheck.sh
index dd7253e..072f9c0 100644
--- a/amd64/scripts/healthcheck.sh
+++ b/amd64/scripts/healthcheck.sh
@@ -2,11 +2,11 @@
 
 # Script checks health of running container
 
-if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ]
+if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
 then
   echo 'Health status: OK - Startup script is still running.'
   exit 0
-elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
+elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
 then
   echo 'Health status: OK - Container is running in maintenance mode.'
   exit 0
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 03e852b..c4bdf08 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Setting healthcheck status to "starting"
-echo "starting" > /opt/iobroker/.docker_config/.healthcheck
+echo "starting" > /opt/scripts/.docker_config/.healthcheck
 
 # Reading ENV
 adminport=$IOB_ADMINPORT
@@ -19,21 +19,21 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
+# Writing necessary ENVs to /opt/scripts/.docker_config/container.config for using it in other scripts
 
-echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
-echo ' ' >> /opt/iobroker/.docker_config/container.config
+echo '# Simple config file to store ENVs' > /opt/scripts/.docker_config/container.config
+echo ' ' >> /opt/scripts/.docker_config/container.config
 if [ "$multihost" = "" ]
 then
-  echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=master" >> /opt/scripts/.docker_config/container.config
 else
-  echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=$multihost" >> /opt/scripts/.docker_config/container.config
 fi
 if [ "$adminport" = "" ]
 then
-  echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=8081" >> /opt/scripts/.docker_config/container.config
 else
-  echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=$adminport" >> /opt/scripts/.docker_config/container.config
 fi
 
 # Getting date and time for logging
@@ -200,12 +200,12 @@ echo "Done."
 echo ' '
 
 # Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/iobroker/.docker_config/.install_host ]
+if [ -f /opt/scripts/.docker_config/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host)
-    rm -f /opt/iobroker/.docker_config/.install_host
+    bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
+    rm -f /opt/scripts/.docker_config/.install_host
   echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
@@ -498,7 +498,7 @@ echo "Starting ioBroker..."
 echo ' '
 
 # Setting healthcheck status to "running"
-echo "running" > /opt/iobroker/.docker_config/.healthcheck
+echo "running" > /opt/scripts/.docker_config/.healthcheck
 
 # Function for graceful shutdown by SIGTERM signal
 shut_down() {
diff --git a/amd64/scripts/maintenance.sh b/amd64/scripts/maintenance.sh
index 0ece4a0..4f77980 100644
--- a/amd64/scripts/maintenance.sh
+++ b/amd64/scripts/maintenance.sh
@@ -2,11 +2,11 @@
 
 if [ "$1" == "status" ]
 then
-  if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ]
+  if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
   then
     echo 'Maintenance mode is ON.'
     exit 0
-  elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ]
+  elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
   then
     echo 'Maintenance mode is OFF.'
     exit 0
@@ -18,7 +18,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Activating maintenance mode...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     sleep 1
     echo 'Done.'
     echo 'Stopping ioBroker...'
@@ -37,7 +37,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     pkill -u root
     exit 0
   else
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index a24ebd0..3f8a35d 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -66,9 +66,9 @@ COPY scripts/userscript_everystart_example.sh userscript_everystart_example.sh
 WORKDIR /
 RUN apt-get update \
     && curl -sL https://iobroker.net/install.sh | bash - \
-    && mkdir -p /opt/iobroker/.docker_config/ \
-    && echo $(hostname) > /opt/iobroker/.docker_config/.install_host \
-    && echo "starting" > /opt/iobroker/.docker_config/.healthcheck \
+    && mkdir -p /opt/scripts/.docker_config/ \
+    && echo $(hostname) > /opt/scripts/.docker_config/.install_host \
+    && echo "starting" > /opt/scripts/.docker_config/.healthcheck \
     && echo $(hostname) > /opt/.firstrun \
     && rm -rf /var/lib/apt/lists/*
 
diff --git a/armv7hf/scripts/healthcheck.sh b/armv7hf/scripts/healthcheck.sh
index dd7253e..072f9c0 100644
--- a/armv7hf/scripts/healthcheck.sh
+++ b/armv7hf/scripts/healthcheck.sh
@@ -2,11 +2,11 @@
 
 # Script checks health of running container
 
-if [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "starting" ]
+if [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "starting" ]
 then
   echo 'Health status: OK - Startup script is still running.'
   exit 0
-elif [ "$(cat /opt/iobroker/.docker_config/.healthcheck)" == "maintenance" ]
+elif [ "$(cat /opt/scripts/.docker_config/.healthcheck)" == "maintenance" ]
 then
   echo 'Health status: OK - Container is running in maintenance mode.'
   exit 0
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index 03e852b..c4bdf08 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Setting healthcheck status to "starting"
-echo "starting" > /opt/iobroker/.docker_config/.healthcheck
+echo "starting" > /opt/scripts/.docker_config/.healthcheck
 
 # Reading ENV
 adminport=$IOB_ADMINPORT
@@ -19,21 +19,21 @@ statesdbtype=$IOB_STATESDB_TYPE
 usbdevices=$USBDEVICES
 zwave=$ZWAVE
 
-# Writing necessary ENVs to /opt/iobroker/.docker_config/container.config for using it in other scripts
+# Writing necessary ENVs to /opt/scripts/.docker_config/container.config for using it in other scripts
 
-echo '# Simple config file to store ENVs' > /opt/iobroker/.docker_config/container.config
-echo ' ' >> /opt/iobroker/.docker_config/container.config
+echo '# Simple config file to store ENVs' > /opt/scripts/.docker_config/container.config
+echo ' ' >> /opt/scripts/.docker_config/container.config
 if [ "$multihost" = "" ]
 then
-  echo "multihost=master" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=master" >> /opt/scripts/.docker_config/container.config
 else
-  echo "multihost=$multihost" >> /opt/iobroker/.docker_config/container.config
+  echo "multihost=$multihost" >> /opt/scripts/.docker_config/container.config
 fi
 if [ "$adminport" = "" ]
 then
-  echo "adminport=8081" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=8081" >> /opt/scripts/.docker_config/container.config
 else
-  echo "adminport=$adminport" >> /opt/iobroker/.docker_config/container.config
+  echo "adminport=$adminport" >> /opt/scripts/.docker_config/container.config
 fi
 
 # Getting date and time for logging
@@ -200,12 +200,12 @@ echo "Done."
 echo ' '
 
 # Checking for first run of a new installation and renaming ioBroker
-if [ -f /opt/iobroker/.docker_config/.install_host ]
+if [ -f /opt/scripts/.docker_config/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    bash iobroker host $(cat /opt/iobroker/.docker_config/.install_host)
-    rm -f /opt/iobroker/.docker_config/.install_host
+    bash iobroker host $(cat /opt/scripts/.docker_config/.install_host)
+    rm -f /opt/scripts/.docker_config/.install_host
   echo "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
@@ -498,7 +498,7 @@ echo "Starting ioBroker..."
 echo ' '
 
 # Setting healthcheck status to "running"
-echo "running" > /opt/iobroker/.docker_config/.healthcheck
+echo "running" > /opt/scripts/.docker_config/.healthcheck
 
 # Function for graceful shutdown by SIGTERM signal
 shut_down() {
diff --git a/armv7hf/scripts/maintenance.sh b/armv7hf/scripts/maintenance.sh
index 0ece4a0..4f77980 100644
--- a/armv7hf/scripts/maintenance.sh
+++ b/armv7hf/scripts/maintenance.sh
@@ -2,11 +2,11 @@
 
 if [ "$1" == "status" ]
 then
-  if [ $(cat /opt/iobroker/.docker_config/.healthcheck) == 'maintenance' ]
+  if [ $(cat /opt/scripts/.docker_config/.healthcheck) == 'maintenance' ]
   then
     echo 'Maintenance mode is ON.'
     exit 0
-  elif [ $(cat /opt/iobroker/.docker_config/.healthcheck) != 'maintenance' ]
+  elif [ $(cat /opt/scripts/.docker_config/.healthcheck) != 'maintenance' ]
   then
     echo 'Maintenance mode is OFF.'
     exit 0
@@ -18,7 +18,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Activating maintenance mode...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     sleep 1
     echo 'Done.'
     echo 'Stopping ioBroker...'
@@ -37,7 +37,7 @@ then
   if [ "$A" == "y" ] || [ "$A" == "Y" ] || [ "$A" == "yes" ]
   then
     echo 'Deactivating maintenance mode and forcing container to stop/ restart...'
-    echo "maintenance" > /opt/iobroker/.docker_config/.healthcheck
+    echo "maintenance" > /opt/scripts/.docker_config/.healthcheck
     pkill -u root
     exit 0
   else