From patchwork Sun Apr 26 11:49:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2, 4/5] fff-gateway: improve order of commands for config version check From: Adrian Schmutzler X-Patchwork-Id: 1380 Message-Id: <20200426114953.1241-4-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Sun, 26 Apr 2020 13:49:52 +0200 Move retrieval of config version, as it makes sense to check for existance of containing file beforehand. Signed-off-by: Adrian Schmutzler --- 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'"