From 660eb08c662a18948d123c4d238b728f14e00e70 Mon Sep 17 00:00:00 2001 From: Oliver Jowett Date: Wed, 10 Dec 2014 02:02:19 +0000 Subject: [PATCH] Ask about json interval before json dir. Skip the dir question if the interval is disabled, it makes more sense that way. --- debian/changelog | 7 +++++++ debian/dump1090-mutability.config | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index 9ad06ea..d95b241 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +dump1090-mutability (1.08.2302.14+1mu-3) UNRELEASED; urgency=medium + + * Ask about json interval before json dir and skip the dir question if + the interval is disabled, it makes more sense that way. + + -- Oliver Jowett Wed, 10 Dec 2014 02:01:27 +0000 + dump1090-mutability (1.08.2302.14+1mu-2) unstable; urgency=medium * Fix a memory leak from use of realpath() in HTTP request processing. diff --git a/debian/dump1090-mutability.config b/debian/dump1090-mutability.config index 1b0e437..9cd1b50 100644 --- a/debian/dump1090-mutability.config +++ b/debian/dump1090-mutability.config @@ -92,11 +92,11 @@ db_go || true; db_get $NAME/auto-start; if [ "$RET" = "true" ]; then db_input medium $NAME/net-bind-address || true db_input low $NAME/stats-interval || true - db_input low $NAME/json-dir || true + db_input low $NAME/json-interval || true - db_go || true; db_get $NAME/json-dir; if [ -n "$RET" ]; then - # only if json-dir was given: - db_input low $NAME/json-interval || true + db_go || true; db_get $NAME/json-interval; if [ -n "$RET" ] && [ "$RET" -gt 0 ]; then + # only if json-interval was given and non-zero + db_input low $NAME/json-dir || true fi db_input low $NAME/extra-args || true