From b5f4c2c87eb0c59570811b3accc2dedf0147d61f Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Tue, 4 Feb 2020 20:19:46 +0100 Subject: global-config: drop $ScriptUpdatesConfigChangesIgnore Comment or remove $GlobalConfigVersion in global-config-overlay to disable change notifications. --- global-config | 4 +--- global-config-overlay | 3 ++- global-config.changes | 1 + global-functions | 2 +- script-updates | 4 +--- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/global-config b/global-config index 95db1c5..a55a9d6 100644 --- a/global-config +++ b/global-config @@ -6,7 +6,7 @@ # Make sure all configuration properties are up to date and this # value is in sync with value in script 'global-functions'! -:global GlobalConfigVersion 11; +:global GlobalConfigVersion 12; # This is used for DNS and backup file. :global Domain "example.com"; @@ -109,8 +109,6 @@ :global ScriptUpdatesIgnore { "global-config" } -# Enable this to silence all configuration warnings. -:global ScriptUpdatesConfigChangesIgnore false; # This project is developed in private spare time and usage is free of charge # for you. If you like the scripts and think this is of value for you or your # business please consider a donation: diff --git a/global-config-overlay b/global-config-overlay index 6b74715..e2c8909 100644 --- a/global-config-overlay +++ b/global-config-overlay @@ -6,7 +6,8 @@ # Make sure all configuration properties are up to date and this # value is in sync with value in script 'global-functions'! -:global GlobalConfigVersion 11; +# Comment or remove to disable change notifications. +:global GlobalConfigVersion 12; # The global-config script is updated by script-updates, # global-config-overlay becomes an overlay for your changes. diff --git a/global-config.changes b/global-config.changes index a8b8126..a22f3b4 100644 --- a/global-config.changes +++ b/global-config.changes @@ -14,4 +14,5 @@ 9="introduced configuration overlay 'global-config-overlay'"; 10="make health threshold for voltage configurable"; 11="introduced function '\$ScriptInstallUpdate' to install new and update existing scripts"; + 12="removed '\$ScriptUpdatesConfigChangesIgnore', comment '\$GlobalConfigVersion' in 'global-config-overlay' to disable change notifications"; }; diff --git a/global-functions b/global-functions index 15cba35..caaf0a5 100644 --- a/global-functions +++ b/global-functions @@ -6,7 +6,7 @@ # global functions # expected configuration version -:global ExpectedConfigVersion 11; +:global ExpectedConfigVersion 12; # global variables not to be changed by user :global SentConfigChangesNotification "-"; diff --git a/script-updates b/script-updates index 42ca04a..10a67b6 100644 --- a/script-updates +++ b/script-updates @@ -13,7 +13,6 @@ :global ScriptUpdatesBaseUrl; :global ScriptUpdatesUrlSuffix; :global ScriptUpdatesIgnore; -:global ScriptUpdatesConfigChangesIgnore; :global SendNotification; @@ -81,8 +80,7 @@ } } -:if ($ScriptUpdatesConfigChangesIgnore!=true && \ - $SentConfigChangesNotification!=$ExpectedConfigVersion && \ +:if ($SentConfigChangesNotification!=$ExpectedConfigVersion && \ $GlobalConfigVersion < $ExpectedConfigVersion) do={ :global GlobalConfigChanges; :local ChangeLogCode; -- cgit v1.2.3-54-g00ecf