From fb6b3512ba4b15d9c724522ad337c23aca777258 Mon Sep 17 00:00:00 2001 From: romeo-golf Date: Mon, 6 Feb 2017 16:49:01 +0000 Subject: [PATCH] main.sh - avoid mixing && and || tests in a single line --- bash/main.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/bash/main.sh b/bash/main.sh index ce71488..d013eb4 100755 --- a/bash/main.sh +++ b/bash/main.sh @@ -257,8 +257,10 @@ if [[ ! "${DUMP1090_INSTALLED}" = "true" ]] ; then fi # If the FlightAware fork of dump1090 is or has been chosen to be installed PiAware must be installed. -if [[ "${DUMP1090_FORK}" = "fa" ]] && [[ "${DUMP1090_DO_UPGRADE}" = "true" ]] || [[ "${DUMP1090_INSTALLED}" = "false" ]] ; then - FORCE_PIAWARE_INSTALL="true" +if [[ "${DUMP1090_FORK}" = "fa" ]] ; then + if [[ "${DUMP1090_DO_UPGRADE}" = "true" ]] || [[ "${DUMP1090_INSTALLED}" = "false" ]] ; then + FORCE_PIAWARE_INSTALL="true" + fi fi # Check if the dump978 binaries exist.