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

Submitted by Adrian Schmutzler on April 25, 2020, 5:51 p.m.

Details

Message ID 20200425175114.2152-4-freifunk@adrianschmutzler.de
State Superseded
Headers show

Commit Message

Adrian Schmutzler April 25, 2020, 5:51 p.m.
Move retrieval of config version, as it makes sense to check for
existance of containing file beforehand.

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

Patch hide | download patch | download mbox

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 8b1cbd27..017c3737 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: '1'"
 

Comments

Fabian Blaese April 26, 2020, 11:23 a.m.
Ich bin mir nicht so richtig sicher, ob mir das so besser gefällt. Aber funktionieren wirds auf jeden Fall.

Reviewed-by: Fabian Bläse <fabian@blaese.de>