| Message ID | 20190813230044.19667-3-fabian@blaese.de |
|---|---|
| State | Superseded |
| Headers | show |
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 new file mode 100644 index 0000000..b2f8b6d --- /dev/null +++ b/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version @@ -0,0 +1,17 @@ +configure() { + local expected_version=1 + local config_version=$(uci -q get gateway.version.config_version) + + # check if gateway config exists + if ! uci -q get gateway; then + echo "ERROR: Gateway config does not exists." + fi + + # check version of configuration + if [ "$config_version" != "$expected_version" ]; then + echo "ERROR: Invalid config version. Expected \'$expected_version\', got \'$config_version\'." + echo "Please check what has been changed and adjust your config appropriately." + + exit 1 + fi +}
In letzter Zeit hab ichs wohl nicht so mit git..
Die \ in dieser Zeile müssen weg:
On 14.08.19 01:00, Fabian Bläse wrote:
> + echo "ERROR: Invalid config version. Expected \'$expected_version\', got \'$config_version\'."
Hallo Fabian, s. inline Am 14. August 2019 01:00:43 MESZ schrieb "Fabian Bläse" <fabian@blaese.de>: >This adds two checks: >- Does gateway config exist? >- Does gateway config version match? > >Signed-off-by: Fabian Bläse <fabian@blaese.de> >--- > .../fff-gateway/files/etc/gateway.d/01-version | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) >create mode 100644 >src/packages/fff/fff-gateway/files/etc/gateway.d/01-version > >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 >new file mode 100644 >index 0000000..b2f8b6d >--- /dev/null >+++ b/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version >@@ -0,0 +1,17 @@ >+configure() { >+ local expected_version=1 >+ local config_version=$(uci -q get gateway.version.config_version) >+ >+ # check if gateway config exists >+ if ! uci -q get gateway; then >+ echo "ERROR: Gateway config does not exists." Hier könnte man ein exit einbauen. >+ fi >+ >+ # check version of configuration >+ if [ "$config_version" != "$expected_version" ]; then >+ echo "ERROR: Invalid config version. Expected \'$expected_version\', >got \'$config_version\'." >+ echo "Please check what has been changed and adjust your config >appropriately." >+ >+ exit 1 >+ fi >+}
Hallo Robert, On 14.08.19 11:51, Robert Langhammer wrote: > Hallo Fabian, s. inline > > Am 14. August 2019 01:00:43 MESZ schrieb "Fabian Bläse" <fabian@blaese.de>: >> 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 >> new file mode 100644 >> index 0000000..b2f8b6d >> --- /dev/null >> +++ b/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version >> @@ -0,0 +1,17 @@ >> +configure() { >> + local expected_version=1 >> + local config_version=$(uci -q get gateway.version.config_version) >> + >> + # check if gateway config exists >> + if ! uci -q get gateway; then >> + echo "ERROR: Gateway config does not exists." > Hier könnte man ein exit einbauen. Und sollte man auch. Ich mache eine v2. Gruß Fabian
This adds two checks: - Does gateway config exist? - Does gateway config version match? Signed-off-by: Fabian Bläse <fabian@blaese.de> --- .../fff-gateway/files/etc/gateway.d/01-version | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 src/packages/fff/fff-gateway/files/etc/gateway.d/01-version