global-functions: $ScriptInstallUpdate: set config and functions not ready...

... before reload. This should fix some corner cases where scripts ran
with broken configuration or functions.

global-config.rsc

@@ -272,7 +272,9 @@
 };
 
 # load custom settings from overlay and snippets
-# Warning: Do *NOT* copy this code to overlay!
+#    /\    Warning: Do *NOT*
+#   /\7\    copy this code
+#  /_()_\     to overlay!
 :foreach Script in=([ /system/script/find where name="global-config-overlay" ], \
                     [ /system/script/find where name~"^global-config-overlay.d/" ]) do={
   :do {

global-functions.rsc

@@ -1126,6 +1126,8 @@
   :global CommitId;
   :global CommitInfo;
   :global ExpectedConfigVersion;
+  :global GlobalConfigReady;
+  :global GlobalFunctionsReady;
   :global Identity;
   :global IDonate;
   :global NoNewsAndChangesNotification;
@@ -1159,8 +1161,7 @@
 
   :local CommitIdBefore $CommitId;
   :local ExpectedConfigVersionBefore $ExpectedConfigVersion;
-  :local ReloadGlobalFunctions false;
+  :local ReloadGlobal false;
-  :local ReloadGlobalConfig false;
   :local DeviceMode [ /system/device-mode/get ];
 
   :local CheckSums ({});
@@ -1269,31 +1270,25 @@
       $LogPrint info $0 ("Updating script: " . $ScriptVal->"name");
       /system/script/set owner=($ScriptVal->"name") \
           source=[ $IfThenElse ($ScriptUpdatesCRLF = true) $SourceCRLF $SourceNew ] $Script;
-      :if ($ScriptVal->"name" = "global-config") do={
+      :if ($ScriptVal->"name" = "global-config" || \
-        :set ReloadGlobalConfig true;
+           $ScriptVal->"name" = "global-functions" || \
-      }
+           $ScriptVal->"name" ~ ("^mod/.")) do={
-      :if ($ScriptVal->"name" = "global-functions" || $ScriptVal->"name" ~ ("^mod/.")) do={
+        :set ReloadGlobal true;
-        :set ReloadGlobalFunctions true;
       }
     } on-error={ }
   }
 
-  :if ($ReloadGlobalFunctions = true) do={
+  :if ($ReloadGlobal = true) do={
-    $LogPrint info $0 ("Reloading global functions.");
+    $LogPrint info $0 ("Reloading global configuration and functions.");
-    :do {
+    :set GlobalConfigReady false;
-      /system/script/run global-functions;
+    :set GlobalFunctionsReady false;
-    } on-error={
+    :delay 1s;
-      $LogPrint error $0 ("Reloading global functions failed!");
-    }
-  }
 
-  :if ($ReloadGlobalConfig = true) do={
+    :onerror Err {
-    $LogPrint info $0 ("Reloading global configuration.");
-    :do {
       /system/script/run global-config;
-    } on-error={
+      /system/script/run global-functions;
-      $LogPrint error $0 ("Reloading global configuration failed!" . \
+    } do={
-        " Syntax error or missing overlay?");
+      $LogPrint error $0 ("Reloading global configuration and functions failed! " . $Err);
     }
   }