Merge pull request #107 from buanet/dev

Dev to beta

.VERSION

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

README.md

@@ -141,7 +141,7 @@ After this the startup script inside the container will automatically detect and
 
 ### Beta testing
 
-If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. You can find the readme.md file for beta versions [here](https://github.com/buanet/docker-iobroker/blob/beta/README.md).
+If you want to get the newest features and changes feel free to use/ test the beta version of the Docker image. You can find the readme.md file for beta versions [here](https://github.com/buanet/docker-iobroker/blob/beta/README.md). Please make sure to read the changelog before testing beta versions.
 
 ### Subscribe to updates
 
@@ -157,9 +157,11 @@ Thank you!
 
 ## Changelog
 
-### v4.2.1beta (2020-05-10)
+### v4.2.2beta (2020-06-03)
-* using node 12 instead of 10
+* workaround for renaming issues on startup
-* updated documentation in readme.md
+* v4.2.1beta (2020-05-10)
+  * using node 12 instead of 10
+  * updated documentation in readme.md
 
 ### v4.2.0 (2020-04-14)
 * v4.1.4beta (2020-04-07)

aarch64/scripts/iobroker_startup.sh

@@ -166,16 +166,24 @@ 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)"..."
-    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 "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
-    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": ")[^"]*')
-  echo 'Done.'
+    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
 
@@ -201,7 +209,7 @@ then
     echo "Adminport set by ENV does not match port configured in ioBroker installation."
     echo "Setting Adminport to \""$adminport"\"..."
     bash iobroker set admin.0 --port $adminport
-    echo 'Done.'
+    echo "Done."
     echo ' '
   fi
 fi

amd64/scripts/iobroker_startup.sh

@@ -166,16 +166,24 @@ 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)"..."
-    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 "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
-    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": ")[^"]*')
-  echo 'Done.'
+    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
 
@@ -201,7 +209,7 @@ then
     echo "Adminport set by ENV does not match port configured in ioBroker installation."
     echo "Setting Adminport to \""$adminport"\"..."
     bash iobroker set admin.0 --port $adminport
-    echo 'Done.'
+    echo "Done."
     echo ' '
   fi
 fi

armv7hf/scripts/iobroker_startup.sh

@@ -166,16 +166,24 @@ 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)"..."
-    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 "Done."
   echo ' '
 elif [ $(bash iobroker object get system.adapter.admin.0 --pretty | grep -oP '(?<="host": ")[^"]*') != $(hostname) ]
 then
   echo "Hostname in ioBroker does not match the hostname of this container."
   echo "Updating hostname to " $(hostname)"..."
-    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": ")[^"]*')
-  echo 'Done.'
+    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
 
@@ -201,7 +209,7 @@ then
     echo "Adminport set by ENV does not match port configured in ioBroker installation."
     echo "Setting Adminport to \""$adminport"\"..."
     bash iobroker set admin.0 --port $adminport
-    echo 'Done.'
+    echo "Done."
     echo ' '
   fi
 fi