From 5db7206b6ec7b28d3f96eb336e3b41eb1be4eb78 Mon Sep 17 00:00:00 2001
From: andre <>
Date: Fri, 5 Jun 2020 21:28:29 +0200
Subject: [PATCH 1/4] Testing

---
 amd64/Dockerfile                  |  3 +++
 amd64/scripts/iobroker_startup.sh | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index fc300d5..0b02751 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -70,6 +70,9 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
+# Testing new js-controller version
+RUN npm install ioBroker/ioBroker.js-controller#3.1.x
+
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
     && tar -cf /opt/initial_userscripts.tar /opt/userscripts
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index 892b84b..ae30e16 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -166,11 +166,11 @@ if [ -f /opt/iobroker/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    oldhostname=$(cat /opt/iobroker/.install_host)
-    newhostname=$(hostname)
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
-    # bash iobroker host $(cat /opt/iobroker/.install_host)
+    # oldhostname=$(cat /opt/iobroker/.install_host)
+    # newhostname=$(hostname)
+    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
+    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
+    bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
   echo "Done."
   echo ' '
@@ -178,11 +178,11 @@ elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
-    oldhostname=$(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
-    newhostname=$(hostname)
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
-    # bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    # oldhostname=$(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    # newhostname=$(hostname)
+    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
+    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
+    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo "Done."
   echo ' '
 fi

From 773ad90893328e35f70dfb767e0e9d49c7696523 Mon Sep 17 00:00:00 2001
From: andre <>
Date: Fri, 5 Jun 2020 22:08:27 +0200
Subject: [PATCH 2/4] reverting

---
 README.md                           |  2 +-
 aarch64/scripts/iobroker_startup.sh | 12 ++----------
 amd64/Dockerfile                    |  2 +-
 amd64/scripts/iobroker_startup.sh   |  8 --------
 armv7hf/scripts/iobroker_startup.sh | 12 ++----------
 5 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/README.md b/README.md
index 71363e5..4606143 100644
--- a/README.md
+++ b/README.md
@@ -158,7 +158,7 @@ Thank you!
 ## Changelog
 
 ### v4.2.2beta (2020-06-03)
-* workaround for renaming issues on startup
+* ~~workaround for renaming issues on startup~~ (fixed in js-controller)
 * v4.2.1beta (2020-05-10)
   * using node 12 instead of 10
   * updated documentation in readme.md
diff --git a/aarch64/scripts/iobroker_startup.sh b/aarch64/scripts/iobroker_startup.sh
index 892b84b..4c2b690 100644
--- a/aarch64/scripts/iobroker_startup.sh
+++ b/aarch64/scripts/iobroker_startup.sh
@@ -166,11 +166,7 @@ if [ -f /opt/iobroker/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    oldhostname=$(cat /opt/iobroker/.install_host)
-    newhostname=$(hostname)
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
-    # bash iobroker host $(cat /opt/iobroker/.install_host)
+    bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
   echo "Done."
   echo ' '
@@ -178,11 +174,7 @@ elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
-    oldhostname=$(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
-    newhostname=$(hostname)
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
-    # bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo "Done."
   echo ' '
 fi
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 0b02751..92f168b 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -70,7 +70,7 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
-# Testing new js-controller version
+# Temporary testing new js-controller version
 RUN npm install ioBroker/ioBroker.js-controller#3.1.x
 
 # Backup initial ioBroker and userscript folder
diff --git a/amd64/scripts/iobroker_startup.sh b/amd64/scripts/iobroker_startup.sh
index ae30e16..4c2b690 100644
--- a/amd64/scripts/iobroker_startup.sh
+++ b/amd64/scripts/iobroker_startup.sh
@@ -166,10 +166,6 @@ if [ -f /opt/iobroker/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    # oldhostname=$(cat /opt/iobroker/.install_host)
-    # newhostname=$(hostname)
-    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
-    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
     bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
   echo "Done."
@@ -178,10 +174,6 @@ elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
-    # oldhostname=$(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
-    # newhostname=$(hostname)
-    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
-    # sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
     bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo "Done."
   echo ' '
diff --git a/armv7hf/scripts/iobroker_startup.sh b/armv7hf/scripts/iobroker_startup.sh
index 892b84b..4c2b690 100644
--- a/armv7hf/scripts/iobroker_startup.sh
+++ b/armv7hf/scripts/iobroker_startup.sh
@@ -166,11 +166,7 @@ if [ -f /opt/iobroker/.install_host ]
 then
   echo "Looks like this is a new and empty installation of ioBroker."
   echo "Hostname needs to be updated to " $(hostname)"..."
-    oldhostname=$(cat /opt/iobroker/.install_host)
-    newhostname=$(hostname)
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
-    # bash iobroker host $(cat /opt/iobroker/.install_host)
+    bash iobroker host $(cat /opt/iobroker/.install_host)
     rm -f /opt/iobroker/.install_host
   echo "Done."
   echo ' '
@@ -178,11 +174,7 @@ elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
-    oldhostname=$(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
-    newhostname=$(hostname)
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/states.json
-    sed -i "s/$oldhostname/$newhostname/g" /opt/iobroker/iobroker-data/objects.json
-    # bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
+    bash iobroker host $(iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*')
   echo "Done."
   echo ' '
 fi

From d00d734a3a5308f4ecd3ed476edb6bdc6cb86731 Mon Sep 17 00:00:00 2001
From: andre <>
Date: Fri, 5 Jun 2020 23:15:33 +0200
Subject: [PATCH 3/4] prepare new beta

---
 .VERSION           | 2 +-
 README.md          | 6 ++++--
 aarch64/Dockerfile | 3 +++
 amd64/Dockerfile   | 4 ++--
 armv7hf/Dockerfile | 3 +++
 5 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.VERSION b/.VERSION
index 2551808..58d9f45 100644
--- a/.VERSION
+++ b/.VERSION
@@ -1 +1 @@
-v4.2.2beta
+v4.2.3beta
diff --git a/README.md b/README.md
index 4606143..82adb8a 100644
--- a/README.md
+++ b/README.md
@@ -157,8 +157,10 @@ Thank you!
 
 ## Changelog
 
-### v4.2.2beta (2020-06-03)
-* ~~workaround for renaming issues on startup~~ (fixed in js-controller)
+### v4.2.3beta (2020-06-05)
+* updating js-controller to not stable version 3.1.5 to fix renaming issue
+* v4.2.2beta (2020-06-03)
+  * ~~workaround for renaming issues on startup~~ (fixed in js-controller)
 * v4.2.1beta (2020-05-10)
   * using node 12 instead of 10
   * updated documentation in readme.md
diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 3a22f81..8fcb57f 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -70,6 +70,9 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
+# Temporary updating js-controller to not stable version
+RUN npm install js-controller@3.1.5
+
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
     && tar -cf /opt/initial_userscripts.tar /opt/userscripts
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index 92f168b..f56cefd 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -70,8 +70,8 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
-# Temporary testing new js-controller version
-RUN npm install ioBroker/ioBroker.js-controller#3.1.x
+# Temporary updating js-controller to not stable version
+RUN npm install js-controller@3.1.5
 
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index 73f0434..7b491f0 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -70,6 +70,9 @@ RUN apt-get update \
 WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
+# Temporary updating js-controller to not stable version
+RUN npm install js-controller@3.1.5
+
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
     && tar -cf /opt/initial_userscripts.tar /opt/userscripts

From c0804b8a7d1867e4330a566d4f0f570960eb9953 Mon Sep 17 00:00:00 2001
From: andre <>
Date: Fri, 5 Jun 2020 23:51:23 +0200
Subject: [PATCH 4/4] has been late

---
 aarch64/Dockerfile | 2 +-
 amd64/Dockerfile   | 2 +-
 armv7hf/Dockerfile | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aarch64/Dockerfile b/aarch64/Dockerfile
index 8fcb57f..d4e3e90 100644
--- a/aarch64/Dockerfile
+++ b/aarch64/Dockerfile
@@ -71,7 +71,7 @@ WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
 # Temporary updating js-controller to not stable version
-RUN npm install js-controller@3.1.5
+RUN npm install iobroker.js-controller@3.1.5
 
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
diff --git a/amd64/Dockerfile b/amd64/Dockerfile
index f56cefd..55f9309 100644
--- a/amd64/Dockerfile
+++ b/amd64/Dockerfile
@@ -71,7 +71,7 @@ WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
 # Temporary updating js-controller to not stable version
-RUN npm install js-controller@3.1.5
+RUN npm install iobroker.js-controller@3.1.5
 
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \
diff --git a/armv7hf/Dockerfile b/armv7hf/Dockerfile
index 7b491f0..ce66351 100644
--- a/armv7hf/Dockerfile
+++ b/armv7hf/Dockerfile
@@ -71,7 +71,7 @@ WORKDIR /opt/iobroker/
 RUN npm install -g node-gyp
 
 # Temporary updating js-controller to not stable version
-RUN npm install js-controller@3.1.5
+RUN npm install iobroker.js-controller@3.1.5
 
 # Backup initial ioBroker and userscript folder
 RUN tar -cf /opt/initial_iobroker.tar /opt/iobroker \