[PATCH v2 4/5] fff-gateway: improve order of commands for config version check

Adrian Schmutzler freifunk at adrianschmutzler.de
So Apr 26 13:49:52 CEST 2020


Move retrieval of config version, as it makes sense to check for
existance of containing file beforehand.

Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 src/packages/fff/fff-gateway/files/etc/gateway.d/01-version | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version b/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version
index 9482868c..41c3cf7f 100644
--- a/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version
+++ b/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version
@@ -1,7 +1,4 @@
 configure() {
-	local expected_version=1
-	local config_version=$(uci -q get gateway.meta.config_version)
-
 	# check if gateway config exists
 	if ! uci -q show gateway > /dev/null; then
 		echo "ERROR: Gateway config could not be parsed or does not exist."
@@ -10,6 +7,9 @@ configure() {
 	fi
 
 	# check version of configuration
+	local expected_version=1
+	local config_version=$(uci -q get gateway.meta.config_version)
+
 	if ! [ -n "$config_version" ]; then
 		echo "ERROR: No config version given. Supported versions: '$expected_version'"
 
-- 
2.20.1



Mehr Informationen über die Mailingliste franken-dev