script-updates: get values into arrays

This commit is contained in:
Christian Hesse 2019-07-25 13:12:17 +02:00
parent 8d4dc1e3f6
commit d9d98cfe9e

View file

@ -18,40 +18,38 @@
:foreach Script in=[ / system script find ] do={ :foreach Script in=[ / system script find ] do={
:local Ignore 0; :local Ignore 0;
:local ScriptName [ / system script get $Script name ]; :local ScriptVal [ / system script get $Script ];
:local ScriptPolicy [ / system script get $Script policy ]; :local ScriptFile [ / file find where name=("script-updates/" . $ScriptVal->"name") ];
:local ScriptFile [ / file find where name=("script-updates/" . $ScriptName) ];
:local SourceNew; :local SourceNew;
:if ([ :len $ScriptFile ] > 0) do={ :if ([ :len $ScriptFile ] > 0) do={
:set SourceNew [ / file get $ScriptFile content ]; :set SourceNew [ / file get $ScriptFile content ];
/ file remove $ScriptFile; / file remove $ScriptFile;
} }
:foreach Scheduler in=[ / system scheduler find where on-event=$ScriptName ] do={ :foreach Scheduler in=[ / system scheduler find where on-event=($ScriptVal->"name") ] do={
:local SchedulerName [ / system scheduler get $Scheduler name ]; :local SchedulerVal [ / system scheduler get $Scheduler ];
:local SchedulerPolicy [ / system scheduler get $Scheduler policy ]; :if ($ScriptVal->"policy" != $SchedulerVal->"policy") do={
:if ($ScriptPolicy != $SchedulerPolicy) do={ :log warning ("Policies differ for script " . $ScriptVal->"name" . \
:log warning ("Policies differ for script " . $ScriptName . \ " and its scheduler " . $SchedulerVal->"name" . "!");
" and its scheduler " . $SchedulerName . "!");
} }
} }
:if ([ :len $SourceNew ] = 0 && $ScriptUpdatesFetch = true) do={ :if ([ :len $SourceNew ] = 0 && $ScriptUpdatesFetch = true) do={
:foreach IgnoreLoop in=$ScriptUpdatesIgnore do={ :foreach IgnoreLoop in=$ScriptUpdatesIgnore do={
:if ($IgnoreLoop = $ScriptName) do={ :set Ignore 1; } :if ($IgnoreLoop = $ScriptVal->"name") do={ :set Ignore 1; }
} }
:if ($Ignore = 0) do={ :if ($Ignore = 0) do={
:log debug ("Fetching script from url: " . $ScriptName); :log debug ("Fetching script from url: " . $ScriptVal->"name");
:do { :do {
:local Result [ / tool fetch check-certificate=yes-without-crl \ :local Result [ / tool fetch check-certificate=yes-without-crl \
($ScriptUpdatesBaseUrl . $ScriptName . $ScriptUpdatesUrlSuffix) \ ($ScriptUpdatesBaseUrl . $ScriptVal->"name" . $ScriptUpdatesUrlSuffix) \
output=user as-value ]; output=user as-value ];
:if ($Result->"status" = "finished") do={ :if ($Result->"status" = "finished") do={
:set SourceNew ($Result->"data"); :set SourceNew ($Result->"data");
} }
} on-error={ } on-error={
:log info ("Failed fetching " . $ScriptName); :log info ("Failed fetching " . $ScriptVal->"name");
} }
} }
} }
@ -62,20 +60,20 @@
:if ($SourceNew != $SourceCurrent) do={ :if ($SourceNew != $SourceCurrent) do={
:local DontRequirePermissions \ :local DontRequirePermissions \
($SourceNew~"\n# requires: dont-require-permissions=yes\n"); ($SourceNew~"\n# requires: dont-require-permissions=yes\n");
:log info ("Updating script: " . $ScriptName); :log info ("Updating script: " . $ScriptVal->"name");
/ system script set owner=$ScriptName source=$SourceNew \ / system script set owner=($ScriptVal->"name") source=$SourceNew \
dont-require-permissions=$DontRequirePermissions $Script; dont-require-permissions=$DontRequirePermissions $Script;
:if ($ScriptName = "global-functions") do={ :if ($ScriptVal->"name" = "global-functions") do={
/ system script run global-functions; / system script run global-functions;
} }
} else={ } else={
:log debug ("Script " . $ScriptName . " did not change."); :log debug ("Script " . $ScriptVal->"name" . " did not change.");
} }
} else={ } else={
:log warning ("Looks like new script " . $ScriptName . " is not valid. Ignoring!"); :log warning ("Looks like new script " . $ScriptVal->"name" . " is not valid. Ignoring!");
} }
} else={ } else={
:log debug ("No update for script " . $ScriptName . "."); :log debug ("No update for script " . $ScriptVal->"name" . ".");
} }
} }