global-functions: move $ScriptRunOnce to optional module

This commit is contained in:
Christian Hesse 2021-09-17 16:32:59 +02:00
parent 8b05d25487
commit 012db05a93
3 changed files with 48 additions and 41 deletions

View file

@ -168,6 +168,8 @@
#:global ScriptUpdatesUrlSuffix "\?h=next"; #:global ScriptUpdatesUrlSuffix "\?h=next";
# Use this for defaults with $ScriptRunOnce # Use this for defaults with $ScriptRunOnce
# Install module with:
# $ScriptInstallUpdate global-functions.d/scriptrunonce
:global ScriptRunOnceBaseUrl ""; :global ScriptRunOnceBaseUrl "";
:global ScriptRunOnceUrlSuffix ""; :global ScriptRunOnceUrlSuffix "";

View file

@ -43,7 +43,6 @@
:global ScriptFromTerminal; :global ScriptFromTerminal;
:global ScriptInstallUpdate; :global ScriptInstallUpdate;
:global ScriptLock; :global ScriptLock;
:global ScriptRunOnce;
:global SendEMail; :global SendEMail;
:global SendEMail2; :global SendEMail2;
:global SendNotification; :global SendNotification;
@ -1000,46 +999,6 @@
:return true; :return true;
} }
# fetch and run script(s) once
:set ScriptRunOnce do={
:local Scripts [ :toarray $1 ];
:global ScriptRunOnceBaseUrl;
:global ScriptRunOnceUrlSuffix;
:global LogPrintExit2;
:global ValidateSyntax;
:foreach Script in=$Scripts do={
:if (!($Script ~ "^(ftp|https\?|sftp)://")) do={
:if ([ :len $ScriptRunOnceBaseUrl ] = 0) do={
$LogPrintExit2 warning $0 ("Script '" . $Script . "' is not an url and base url is not available.") true;
}
:set Script ($ScriptRunOnceBaseUrl . $Script . $ScriptRunOnceUrlSuffix);
}
:local Source;
:do {
:set Source ([ / tool fetch check-certificate=yes-without-crl $Script output=user as-value ]->"data");
} on-error={
$LogPrintExit2 warning $0 ("Failed fetching script '" . $Script . "'!") false;
}
:if ([ :len $Source ] > 0) do={
:if ([ $ValidateSyntax $Source ] = true) do={
:do {
$LogPrintExit2 info $0 ("Running script '" . $Script . "' now.") false;
[ :parse $Source ];
} on-error={
$LogPrintExit2 warning $0 ("The script '" . $Script . "' failed to run!") false;
}
} else={
$LogPrintExit2 warning $0 ("The script '" . $Script . "' failed syntax validation!") false;
}
}
}
}
# send notification via e-mail - expects at lease two string arguments # send notification via e-mail - expects at lease two string arguments
:set SendEMail do={ :set SendEMail do={
:global SendEMail2; :global SendEMail2;

View file

@ -0,0 +1,46 @@
#!rsc by RouterOS
# RouterOS script: global-functions.d/scriptrunonece
# Copyright (c) 2020-2021 Christian Hesse <mail@eworm.de>
# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
:global ScriptRunOnce;
# fetch and run script(s) once
:set ScriptRunOnce do={
:local Scripts [ :toarray $1 ];
:global ScriptRunOnceBaseUrl;
:global ScriptRunOnceUrlSuffix;
:global LogPrintExit2;
:global ValidateSyntax;
:foreach Script in=$Scripts do={
:if (!($Script ~ "^(ftp|https\?|sftp)://")) do={
:if ([ :len $ScriptRunOnceBaseUrl ] = 0) do={
$LogPrintExit2 warning $0 ("Script '" . $Script . "' is not an url and base url is not available.") true;
}
:set Script ($ScriptRunOnceBaseUrl . $Script . $ScriptRunOnceUrlSuffix);
}
:local Source;
:do {
:set Source ([ / tool fetch check-certificate=yes-without-crl $Script output=user as-value ]->"data");
} on-error={
$LogPrintExit2 warning $0 ("Failed fetching script '" . $Script . "'!") false;
}
:if ([ :len $Source ] > 0) do={
:if ([ $ValidateSyntax $Source ] = true) do={
:do {
$LogPrintExit2 info $0 ("Running script '" . $Script . "' now.") false;
[ :parse $Source ];
} on-error={
$LogPrintExit2 warning $0 ("The script '" . $Script . "' failed to run!") false;
}
} else={
$LogPrintExit2 warning $0 ("The script '" . $Script . "' failed syntax validation!") false;
}
}
}
}