Merge pull request #108 from buanet/dev

Dev to beta

.VERSION

@@ -1 +1 @@
-v4.2.2beta
+v4.2.3beta

README.md

@@ -157,8 +157,10 @@ Thank you!
 
 ## Changelog
 
-### v4.2.2beta (2020-06-03)
-* workaround for renaming issues on startup
+### 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

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 iobroker.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

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

amd64/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 iobroker.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

amd64/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

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 iobroker.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

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