aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--global-functions13
1 files changed, 6 insertions, 7 deletions
diff --git a/global-functions b/global-functions
index 7646aea..16704c6 100644
--- a/global-functions
+++ b/global-functions
@@ -731,15 +731,15 @@
:if ([ :len $SourceNew ] = 0 && $ScriptUpdatesFetch = true) do={
:local Comment [ $ParseKeyValueStore ($ScriptVal->"comment") ];
:if (!($Comment->"ignore" = true)) do={
- $LogPrintExit2 debug $0 ("Fetching script from url: " . $ScriptVal->"name") false;
:do {
:local BaseUrl $ScriptUpdatesBaseUrl;
:local UrlSuffix $ScriptUpdatesUrlSuffix;
:if ([ :typeof ($Comment->"base-url") ] = "str") do={ :set BaseUrl ($Comment->"base-url"); }
:if ([ :typeof ($Comment->"url-suffix") ] = "str") do={ :set UrlSuffix ($Comment->"url-suffix"); }
+ :local Url ($BaseUrl . $ScriptVal->"name" . $UrlSuffix);
- :local Result [ / tool fetch check-certificate=yes-without-crl \
- ($BaseUrl . $ScriptVal->"name" . $UrlSuffix) output=user as-value ];
+ $LogPrintExit2 debug $0 ("Fetching script '" . $ScriptVal->"name" . "' from url: " . $Url) false;
+ :local Result [ / tool fetch check-certificate=yes-without-crl $Url output=user as-value ];
:if ($Result->"status" = "finished") do={
:set SourceNew ($Result->"data");
}
@@ -804,11 +804,10 @@
:global GlobalConfigMigration;
:local ChangeLogCode;
- $LogPrintExit2 debug $0 ("Fetching news, changes and migration.") false;
:do {
- :local Result [ / tool fetch check-certificate=yes-without-crl \
- ($ScriptUpdatesBaseUrl . "global-config.changes" . $ScriptUpdatesUrlSuffix) \
- output=user as-value ];
+ :local Url ($ScriptUpdatesBaseUrl . "global-config.changes" . $ScriptUpdatesUrlSuffix);
+ $LogPrintExit2 debug $0 ("Fetching news, changes and migration: " . $Url) false;
+ :local Result [ / tool fetch check-certificate=yes-without-crl $Url output=user as-value ];
:if ($Result->"status" = "finished") do={
:set ChangeLogCode ($Result->"data");
}