From 56e641a980a184b76914f8808793b7e952cdf76e Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Mon, 9 Jul 2018 16:05:04 +0200 Subject: script-updates: support fetch from url --- global-config | 6 ++++++ script-updates | 49 ++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 9 deletions(-) diff --git a/global-config b/global-config index 534df40..fcc9dfb 100644 --- a/global-config +++ b/global-config @@ -37,6 +37,12 @@ # ntp settings. A pool can rotate servers. :global "ntp-pool" "pool.ntp.org"; +# Enable this to fetch scripts from given url. +:global "script-updates-fetch" false; +:global "script-updates-baseurl" "https://git.eworm.de/cgit.cgi/routeros-scripts/plain/"; +:global "script-updates-ignore" { "global-config"; "GeneratePSK" } +:global "script-updates-fetch-ignore" { "" }; + # Do *NOT* change these! :global "sent-routeros-update-notification" false; :global "identity" [ / system identity get name ]; diff --git a/script-updates b/script-updates index 13480d1..ffa8da4 100644 --- a/script-updates +++ b/script-updates @@ -1,17 +1,48 @@ # RouterOS script: script-updates # Copyright (c) 2013-2018 Christian Hesse # -# update installed scripts from file +# update installed scripts from file or url + +:global "script-updates-fetch"; +:global "script-updates-baseurl"; +:global "script-updates-ignore"; +:global "script-updates-fetch-ignore"; :foreach script in=[ / system script find ] do={ + :local ignore 0; :local scriptname [ / system script get $script name ]; - :local scriptfile [ / file find where name=("script-updates/" . $scriptname) ]; - :if ([ :len $scriptfile ] > 0) do={ - :log info ("Updating script: " . $scriptname); - :local scriptcontent [ / file get $scriptfile content ]; - / system script set owner=$scriptname source=$scriptcontent $script; - / file remove $scriptfile; - } else={ - :log debug ("No update for script " . $scriptname); + + :foreach "ignore-loop" in=$"script-updates-ignore" do={ + :if ($"ignore-loop" = $scriptname) do={ :set ignore 1; } + } + + :if ($ignore = 0) do={ + :local scriptfile [ / file find where name=("script-updates/" . $scriptname) ]; + + :if ([ :len $scriptfile ] = 0 && $"script-updates-fetch" = true) do={ + :foreach "ignore-loop" in=$"script-updates-fetch-ignore" do={ + :if ($"ignore-loop" = $scriptname) do={ :set ignore 1; } + } + + :if ($ignore = 0) do={ + :log debug ("Fetching script from url: " . $scriptname); + / tool fetch dst-path=("script-updates/" . $scriptname) ($"script-updates-baseurl" . $scriptname); + :set scriptfile [ / file find where name=("script-updates/" . $scriptname) ]; + } + } + + :if ([ :len $scriptfile ] > 0) do={ + :local filecontent [ / file get $scriptfile content ]; + :local scriptsource [ / system script get $script source ]; + :if ($filecontent = $scriptsource) do={ + :log debug ("Script " . $scriptname . " did not change"); + } else={ + :log info ("Updating script: " . $scriptname); + / system script set owner=$scriptname source=$filecontent $script; + } + / file remove $scriptfile; + } else={ + :log debug ("No update for script " . $scriptname); + } } } -- cgit v1.2.3-70-g09d2