Ask about json interval before json dir. Skip the dir question if

the interval is disabled, it makes more sense that way.
This commit is contained in:
Oliver Jowett 2014-12-10 02:02:19 +00:00
parent 2a2306ff57
commit 660eb08c66
2 changed files with 11 additions and 4 deletions

7
debian/changelog vendored
View file

@ -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 <oliver@mutability.co.uk> Wed, 10 Dec 2014 02:01:27 +0000
dump1090-mutability (1.08.2302.14+1mu-2) unstable; urgency=medium dump1090-mutability (1.08.2302.14+1mu-2) unstable; urgency=medium
* Fix a memory leak from use of realpath() in HTTP request processing. * Fix a memory leak from use of realpath() in HTTP request processing.

View file

@ -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 medium $NAME/net-bind-address || true
db_input low $NAME/stats-interval || true db_input low $NAME/stats-interval || true
db_input low $NAME/json-dir || 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_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 fi
db_input low $NAME/extra-args || true db_input low $NAME/extra-args || true