packages-update: early exit with :exit

This commit is contained in:
Christian Hesse 2026-01-19 15:23:27 +01:00
parent b8839ed6df
commit 34ca3fd2ef

View file

@ -9,7 +9,6 @@
# download packages and reboot for installation # download packages and reboot for installation
# https://rsc.eworm.de/doc/packages-update.md # https://rsc.eworm.de/doc/packages-update.md
:local ExitOK false;
:onerror Err { :onerror Err {
:global GlobalConfigReady; :global GlobalFunctionsReady; :global GlobalConfigReady; :global GlobalFunctionsReady;
:retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \ :retry { :if ($GlobalConfigReady != true || $GlobalFunctionsReady != true) \
@ -59,28 +58,24 @@
} }
:if ([ $ScriptLock $ScriptName ] = false) do={ :if ([ $ScriptLock $ScriptName ] = false) do={
:set ExitOK true; :exit;
:error false;
} }
:if ([ :len [ /system/scheduler/find where name="running-from-backup-partition" ] ] > 0) do={ :if ([ :len [ /system/scheduler/find where name="running-from-backup-partition" ] ] > 0) do={
$LogPrint warning $ScriptName ("Running from backup partition, refusing to act."); $LogPrint warning $ScriptName ("Running from backup partition, refusing to act.");
:set ExitOK true; :exit;
:error false;
} }
:local Update [ /system/package/update/get ]; :local Update [ /system/package/update/get ];
:if ([ :typeof ($Update->"latest-version") ] = "nothing") do={ :if ([ :typeof ($Update->"latest-version") ] = "nothing") do={
$LogPrint warning $ScriptName ("Latest version is not known."); $LogPrint warning $ScriptName ("Latest version is not known.");
:set ExitOK true; :exit;
:error false;
} }
:if ($Update->"installed-version" = $Update->"latest-version") do={ :if ($Update->"installed-version" = $Update->"latest-version") do={
$LogPrint info $ScriptName ("Version " . $Update->"latest-version" . " is already installed."); $LogPrint info $ScriptName ("Version " . $Update->"latest-version" . " is already installed.");
:set ExitOK true; :exit;
:error true;
} }
:local RunOrder ({}); :local RunOrder ({});
@ -111,13 +106,11 @@
$LogPrint info $ScriptName ("User requested to continue anyway."); $LogPrint info $ScriptName ("User requested to continue anyway.");
} else={ } else={
$LogPrint info $ScriptName ("Canceled update..."); $LogPrint info $ScriptName ("Canceled update...");
:set ExitOK true; :exit;
:error false;
} }
} else={ } else={
$LogPrint warning $ScriptName ("Canceled non-interactive update."); $LogPrint warning $ScriptName ("Canceled non-interactive update.");
:set ExitOK true; :exit;
:error false;
} }
} }
} }
@ -136,8 +129,7 @@
} }
} else={ } else={
$LogPrint warning $ScriptName ("Not installing downgrade automatically."); $LogPrint warning $ScriptName ("Not installing downgrade automatically.");
:set ExitOK true; :exit;
:error false;
} }
} }
@ -145,8 +137,7 @@
:local PkgName [ /system/package/get $Package name ]; :local PkgName [ /system/package/get $Package name ];
:if ([ $DownloadPackage $PkgName ($Update->"latest-version") ] = false) do={ :if ([ $DownloadPackage $PkgName ($Update->"latest-version") ] = false) do={
$LogPrint error $ScriptName ("Download for package " . $PkgName . " failed, update aborted."); $LogPrint error $ScriptName ("Download for package " . $PkgName . " failed, update aborted.");
:set ExitOK true; :exit;
:error false;
} }
} }
@ -160,14 +151,12 @@
:put "Do you want to (s)chedule reboot or (r)eboot now? [s/R]"; :put "Do you want to (s)chedule reboot or (r)eboot now? [s/R]";
:if (([ /terminal/inkey timeout=60 ] % 32) = 19) do={ :if (([ /terminal/inkey timeout=60 ] % 32) = 19) do={
$Schedule $ScriptName; $Schedule $ScriptName;
:set ExitOK true; :exit;
:error true;
} }
} else={ } else={
:if ($PackagesUpdateDeferReboot = true || [ :totime $PackagesUpdateDeferReboot ] >= 1d) do={ :if ($PackagesUpdateDeferReboot = true || [ :totime $PackagesUpdateDeferReboot ] >= 1d) do={
$Schedule $ScriptName; $Schedule $ScriptName;
:set ExitOK true; :exit;
:error true;
} }
} }
@ -175,5 +164,5 @@
:delay 1s; :delay 1s;
/system/reboot; /system/reboot;
} do={ } do={
:global ExitError; $ExitError $ExitOK [ :jobname ] $Err; :global ExitError; $ExitError false [ :jobname ] $Err;
} }