move reboot message

Author: TrystanLea

module.json

@@ -1,6 +1,6 @@
 {
     "name"         : "EmonScripts",
-    "version"      : "1.8.14",
+    "version"      : "1.8.15",
     "location"     : "/opt/openenergymonitor",
     "branches_available": ["stable","master"],
     "requires": []

update/main.sh

@@ -148,24 +148,27 @@ fi
 
 # -----------------------------------------------------------------
 
+if [ "$type" == "all" ] || [ "$type" == "emoncms" ]; then
+    echo "service-runner will be restarted at the end"
+fi
+
 datestr=$(date)
 
 echo
 echo "-------------------------------------------------------------"
 echo "System update done: $datestr" # this text string is used by service runner to stop the log window polling, DO NOT CHANGE!
 echo "-------------------------------------------------------------"
 
-# -----------------------------------------------------------------
-
-if [ "$type" == "all" ] || [ "$type" == "emoncms" ]; then
-    echo "restarting service-runner"
-    sudo systemctl restart service-runner.service 
-fi
-
 # Display REBOOT REQUIRED message if flag file exists
 if [ -f /tmp/emon_reboot_required ]; then
     echo
     echo "*************************************************************"
     echo "******************** REBOOT REQUIRED ************************"
     echo "*************************************************************"
 fi
+# -----------------------------------------------------------------
+
+if [ "$type" == "all" ] || [ "$type" == "emoncms" ]; then
+    sudo systemctl restart service-runner.service 
+fi
+