diff options
| -rw-r--r-- | early-errors | 6 | ||||
| -rw-r--r-- | global-config | 2 | ||||
| -rw-r--r-- | global-config-overlay | 2 | ||||
| -rw-r--r-- | global-config.changes | 2 | ||||
| -rw-r--r-- | global-functions | 2 | ||||
| -rw-r--r-- | global-wait | 11 | ||||
| -rw-r--r-- | mode-button-event | 6 | ||||
| -rw-r--r-- | mode-button-scheduler | 6 | ||||
| -rw-r--r-- | script-updates | 6 |
9 files changed, 5 insertions, 38 deletions
diff --git a/early-errors b/early-errors deleted file mode 100644 index 7c2e509..0000000 --- a/early-errors +++ /dev/null @@ -1,6 +0,0 @@ -#!rsc by RouterOS -# RouterOS script: early-errors - -:global LogPrintExit2; - -$LogPrintExit2 warning "early-errors" ("This script has been replaced. Please migrate to 'log-forward'.") true; diff --git a/global-config b/global-config index efc5c2d..b4f4a28 100644 --- a/global-config +++ b/global-config @@ -8,7 +8,7 @@ # Make sure all configuration properties are up to date and this # value is in sync with value in script 'global-functions'! -:global GlobalConfigVersion 60; +:global GlobalConfigVersion 61; # This is used for DNS and backup file. :global Domain "example.com"; diff --git a/global-config-overlay b/global-config-overlay index c65322b..f8d2cee 100644 --- a/global-config-overlay +++ b/global-config-overlay @@ -8,7 +8,7 @@ # Make sure all configuration properties are up to date and this # value is in sync with value in script 'global-functions'! # Comment or remove to disable news and change notifications. -:global GlobalConfigVersion 60; +:global GlobalConfigVersion 61; # Copy configuration from global-config here and modify it. diff --git a/global-config.changes b/global-config.changes index e3a035d..4fd107b 100644 --- a/global-config.changes +++ b/global-config.changes @@ -64,6 +64,7 @@ 58="Added a cleanup script for 'hotspot-to-wpa' to purge old access list entries."; 59="Updating CAP with 'check-routeros-update' is now possible with opt-in."; 60="Implemented a pre-down hook in 'netwatch-notify' that fires at two thirds of failed checks."; + 61="Finally removed old scripts."; }; # Migration steps to be applied on script updates @@ -72,4 +73,5 @@ 47="/ certificate remove [ find where fingerprint=\"731d3d9cfaa061487a1d71445a42f67df0afca2a6c2d2f98ff7b3ce112b1f568\" or fingerprint=\"25847d668eb4f04fdd40b12b6b0740c567da7d024308eb6c2c96fe41d9de218d\" ];"; 52=":global CertificateDownload; :if ([ :len [ / certificate find where fingerprint=\"67add1166b020ae61b8f5fc96813c04c2aa589960796865572a3c7e737613dfd\" or fingerprint=\"96bcec06264976f37460779acf28c5a7cfe8a3c0aae11a8ffcee05c0bddf08c6\" ] ] < 2) do={ \$CertificateDownload \"R3\"; }; / certificate remove [ find where fingerprint=\"0687260331a72403d909f105e69bcf0d32e1bd2493ffc6d9206d11bcd6770739\" ];"; 54=":global ScriptInstallUpdate; :global TelegramTokenId; :global TelegramChatId; :if ([ :len \$TelegramTokenId ] > 0 && [ :len \$TelegramChatId ] > 0) do={ \$ScriptInstallUpdate global-functions.d/notification-telegram; }"; + 61="/ system script remove [ find where name~\"^(early-errors|global-wait|mode-button-(event|scheduler)|script-updates)\\\$\" source~\"^#!rsc by RouterOS\\n\" ];"; }; diff --git a/global-functions b/global-functions index ad489a9..df2cc54 100644 --- a/global-functions +++ b/global-functions @@ -8,7 +8,7 @@ # https://git.eworm.de/cgit/routeros-scripts/about/ # expected configuration version -:global ExpectedConfigVersion 60; +:global ExpectedConfigVersion 61; # global variables not to be changed by user :global GlobalFunctionsReady false; diff --git a/global-wait b/global-wait deleted file mode 100644 index 3ce6d27..0000000 --- a/global-wait +++ /dev/null @@ -1,11 +0,0 @@ -#!rsc by RouterOS -# RouterOS script: global-wait - -:global GlobalFunctionsReady; -:while ($GlobalFunctionsReady != true) do={ - :delay 500ms; -} - -:global LogPrintExit2; - -$LogPrintExit2 warning "global-wait" ("This script is now useless, please remove it from configuration.") true; diff --git a/mode-button-event b/mode-button-event deleted file mode 100644 index 09c0283..0000000 --- a/mode-button-event +++ /dev/null @@ -1,6 +0,0 @@ -#!rsc by RouterOS -# RouterOS script: mode-button-event - -:global LogPrintExit2; - -$LogPrintExit2 warning "mode-button-event" ("This script's functionality has been merged into 'mode-button'.") true; diff --git a/mode-button-scheduler b/mode-button-scheduler deleted file mode 100644 index f7045b2..0000000 --- a/mode-button-scheduler +++ /dev/null @@ -1,6 +0,0 @@ -#!rsc by RouterOS -# RouterOS script: mode-button-scheduler - -:global LogPrintExit2; - -$LogPrintExit2 warning "mode-button-scheduler" ("This script's functionality has been merged into 'mode-button'.") true; diff --git a/script-updates b/script-updates deleted file mode 100644 index e35f15c..0000000 --- a/script-updates +++ /dev/null @@ -1,6 +0,0 @@ -#!rsc by RouterOS -# RouterOS script: script-updates - -:global LogPrintExit2; - -$LogPrintExit2 warning "script-updates" ("This script has been replaced by function '\$ScriptInstallUpdate'.") true; |