From aef2637c1e72ec3fabfb0c1b90145d294d93e9dd Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 20 Jul 2022 13:43:33 +0200 Subject: [PATCH] check-setup: get minifirewall version from internal variable there is no other backward compatible way : * really old version don't have a know version * some versions used to display the version on each command, but it is removed. * the VERSION variable seems to be the most forward-compatible way --- server/CHANGELOG.md | 2 ++ server/lib/bkctld-check-setup | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/server/CHANGELOG.md b/server/CHANGELOG.md index cf3a7e4..ccc06fc 100644 --- a/server/CHANGELOG.md +++ b/server/CHANGELOG.md @@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Changed +* check-setup: get minifirewall version from internal variable (there is no other backward compatible way) + ### Deprecated ### Removed diff --git a/server/lib/bkctld-check-setup b/server/lib/bkctld-check-setup index 8bbcda9..5f9983a 100755 --- a/server/lib/bkctld-check-setup +++ b/server/lib/bkctld-check-setup @@ -29,7 +29,7 @@ fi # Check if the firewall file is sourced minifirewall_config=/etc/default/minifirewall -minifirewall_version=$(/etc/init.d/minifirewall status | head -1 | cut -d ' ' -f 3) +minifirewall_version=$(grep -E -o "^VERSION=(\S+)" /etc/init.d/minifirewall | head -1 | cut -d '=' -f 2 | tr -d "'" | tr -d '"') if [ -n "${FIREWALL_RULES}" ] \ && [ -r "${FIREWALL_RULES}" ] \