From: vados-dev <192440777+vados-dev@users.noreply.github.com> Date: Thu, 30 Apr 2026 12:30:03 +0000 (+0300) Subject: Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:30:02 30.04.2026. X-Git-Url: https://git.vados.ru/gitweb.cgi?a=commitdiff_plain;h=0766014cbd9868443b8c735f7906d8185957ff82;p=Mikrotiks%2Fros.vados.ru.git Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:30:02 30.04.2026. --- diff --git a/html/AM-Backup-UpdateEmail.rsc b/html/AM-Backup-UpdateEmail.rsc index f90d1cf58..927f53861 100644 --- a/html/AM-Backup-UpdateEmail.rsc +++ b/html/AM-Backup-UpdateEmail.rsc @@ -18,7 +18,6 @@ :global LogPrint; :global EditSchedulers; -:global OSUpdateMode; :local SchedInterval "7d"; :local SchedStartTime "03:41:27"; @@ -99,20 +98,26 @@ :local CheckOSUpdateMode; :set CheckOSUpdateMode do={ :local NewMode [ :tostr $1 ]; + :if ([ :len $NewMode ] = 0) do={ + :log error ($0 . "/nFunction /$CheckOSUpdateMode received empty value!"); + :return false; + :set ExitOK false; + :error true; + } + :global BackupAndUpdateMode; - :global LogPrint; :global OldMode [ :tostr $BackupAndUpdateMode ]; - :if ([ $NewMode ] != false && $NewMode != $OldMode && $NewMode = "updateOnce") do={ - :set BackupAndUpdateMode $NewMode; - $LogPrint warning $0 ("/nOk. /$OsUpdateMode = " . $NewMode . ".\nYou're a good boy! ))\nI'm launching the update in 5 seconds."); + :if ($NewMode != $BackupAndUpdateMode && $NewMode = "updateOnce") do={ + :set BackupAndUpdateMode [ :tostr $NewMode ]; + :log info ($0 . "/nOk. /$BackupAndUpdateMode set to: '" . $NewMode . "'.\nYou're a good boy! ))\nI'm launching the update in 5 seconds."); :delay 5; /system/script { run $ScriptName; }; } else={ - $LogPrint warning $0 ("/nFunction /$CheckOSUpdateMode received value: '" . $NewMode . "', but is may be only \"updateOnce\"!"); + :log warning ($0 . "/nFunction /$CheckOSUpdateMode received value: '" . $NewMode . "', but is may be only \"updateOnce\"!"); :return false; } :error false; -}; +} # :if ([ :len [ /system/scheduler/find where name="running-from-backup-partition" ] ] > 0) do={ # $LogPrint warning $ScriptName ("Running from backup partition, refusing to act."); diff --git a/html/AM-GlobalFunc.rsc b/html/AM-GlobalFunc.rsc index cb2cfff48..3f415fa10 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/289/1ad51458"; +:global CommitId "main/290/58c18add"; :global CommitTAG "unknown"; -:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:10:02 30.04.2026."; +:global CommitInfo "Autocommit in repo: ros.vados.ru, generated by owner: root, in 15:30:02 30.04.2026."; # The variables are received right here. :global GlobalConfVersion 138;