diff options
| author |  Christian Hesse <mail@eworm.de> | 2019-09-03 20:59:00 +0200 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2019-09-12 21:29:41 +0200 |
| commit | 1cee36a911ef20374cbafc989a5d3699c3fc0def (patch) | |
| tree | d4198905fdfa5c848a462d5dcac6afb25628a4d3 /script-updates | |
| parent | 2258087aab5c94a3970685f7f25587ed5403111d (diff) | |
introduce global-config-overlaychange-9
Diffstat (limited to 'script-updates')
| -rw-r--r-- | script-updates | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/script-updates b/script-updates index de8bf40..8b70a98 100644 --- a/script-updates +++ b/script-updates @@ -63,6 +63,10 @@ :log info ("Updating script: " . $ScriptVal->"name"); / system script set owner=($ScriptVal->"name") source=$SourceNew \ dont-require-permissions=$DontRequirePermissions $Script; + :if ($ScriptVal->"name" = "global-config" && \ + [ / system script print count-only where name="global-config-overlay" ] > 0) do={ + / system script { run global-config; run global-config-overlay; } + } :if ($ScriptVal->"name" = "global-functions") do={ / system script run global-functions; } @@ -82,10 +86,14 @@ $GlobalConfigVersion < $ExpectedConfigVersion) do={ :global GlobalConfigChanges; :local ChangeLogCode; + :local ConfigScript "global-config"; + :if ([ /system script print count-only where name="global-config-overlay" ] > 0) do={ + :set ConfigScript "global-config-overlay"; + } :local NotificationMessage ("Current configuration on " . $Identity . \ - " is out of date. Please update global-config, then increase " . \ + " is out of date. Please update " . $ConfigScript . ", then increase " . \ "variable GlobalConfigVersion (currently " . $GlobalConfigVersion . \ - ") to " . $ExpectedConfigVersion . " and re-run global-config."); + ") to " . $ExpectedConfigVersion . " and re-run " . $ConfigScript . "."); :log debug ("Fetching changelog."); :do { |