From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Mon, 4 May 2026 03:40:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:40:03 04.05.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=c6b1fd0f1fad69e2177f17e953ceeab988b1e1d7;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:40:03 04.05.2026. --- diff --git a/html/AM-FwAddrLists.rsc b/html/AM-FwAddrLists.rsc index c3efb2061..f68182bb6 100644 --- a/html/AM-FwAddrLists.rsc +++ b/html/AM-FwAddrLists.rsc @@ -54,7 +54,7 @@ :delay 5m; } - :local ListComment ("managed by " . $ScriptName); + :local ListComment ("managed by " . $ :local FwAddrListsIndex false; :local FwAddrListsIndex false; :for I from=1 to=5 do={ @@ -75,10 +75,10 @@ :local FwListName ($FwListFile->0); :local Delim [ $FindDelim $FwListName ]; :if ($Delim = 0) do={ :set FwListName ""; }; - :if ([ :len $FwListName ] > 0) do={ :set FwListName [ :pick $FwListName 0 $Delim ]; } + :if ([ :len $FwListName ] = 0) do={ :error true; } + :set FwListName [ :pick $FwListName 0 $Delim ]; :local FwListUrl ($FwAddrListsUrl . $FwListName); - :if ([ :len $FwListName ] > 0) do={ :local CntAdd 0; :local CntRenew 0; :local CntRemove 0; @@ -110,8 +110,7 @@ :set Line ($Line->0); :local Delim [ $FindDelim $Line ]; :if ($Delim = 0) do={ :set Line ""; }; - :if ([ :len $Line ] = 0) do={ :set Line "#"; } - :if ([ :pick $Line 0 1 ] != "#") do={ + :if ([ :len $Line ] = 0) do={ :error true; } :local Address; :if ([ :pick $Line 0 1 ] = "{" && [ :pick $Line ([ :len $Line ] - 1) ] = "}") do={ :do { @@ -241,7 +240,6 @@ " - renewed: " . [ $HumanReadableNum $CntRenew 1000 ] . \ " - removed: " . [ $HumanReadableNum $CntRemove 1000 ]); } - } } do={ :global ExitError; $ExitError $ExitOK [ :jobname ] $Err; } diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index c13df53cd..5f92ec744 100644 --- a/html/AM-GlobalFunc.rsc +++ b/html/AM-GlobalFunc.rsc @@ -17,9 +17,9 @@ :global GlobalFuncReady false; # Git commit id & info, expected configuration version -:global CommitId "main/514/319099c8"; +:global CommitId "main/515/51cd6d6a"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:30:02 04.05.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 06:40:03 04.05.2026."; # The variables are received right here. :global GlobalConfVersion 138;