From fbd0b044053f9158f106ff38e0c02c71a7474122 Mon Sep 17 00:00:00 2001
From: Joseph Herlant <aerostitch@debian.org>
Date: Fri, 30 Aug 2019 12:00:54 -0700
Subject: Refactoring:tools: Check exit code directly with e.g. "if mycmd;",
 not indirectly with $?

---
 navit/script/cabify.sh   |  3 +--
 navit/startonce.sh       | 20 +++++++++-----------
 navit/tools/cleanattr.sh |  9 ++++-----
 3 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/navit/script/cabify.sh b/navit/script/cabify.sh
index ea6dba4b4..98a475072 100755
--- a/navit/script/cabify.sh
+++ b/navit/script/cabify.sh
@@ -2,8 +2,7 @@
 
 function check_pocketcab()
 {
-	which pocketpc-cab &> /dev/null
-	if [ $? -ne 0 ]
+	if ! which pocketpc-cab &> /dev/null
 	then
 		echo "You don't have pocketpc-cab installed or not in PATH"
 		exit
diff --git a/navit/startonce.sh b/navit/startonce.sh
index 3e27d77f0..04220b33b 100755
--- a/navit/startonce.sh
+++ b/navit/startonce.sh
@@ -21,9 +21,8 @@ NAVIT="./navit"
 
 function check_wmctrl()
 {
-	which wmctrl > /dev/null
-
-	if [ $? -ne 0 ] ; then
+	if ! which wmctrl > /dev/null
+	then
 		echo "I need the 'wmctrl' program. Exit."
 		exit 1
 	fi
@@ -39,9 +38,8 @@ function start_navit()
 
 	pid=$!
 
-	echo -n "$pid" > $PIDFILE
-
-	if [ $? -eq 0 ] ; then
+	if ! echo -n "$pid" > $PIDFILE
+	then
 		echo "Started navit with PID $pid."
 	else
 		kill $pid
@@ -59,12 +57,12 @@ function check_navit()
 {
 	if [ -f $PIDFILE ] ; then
     pid=$(cat $PIDFILE)
-		kill -0 $pid 2>/dev/null
-		if [ $? -eq 0 ] ; then
-			echo "Bringing Navit to front"
+		if ! kill -0 $pid 2>/dev/null
+		then
+            echo "Bringing Navit to front"
 
-      winid=$(wmctrl -l -p | grep -e "^[^:blank:]*[:blank:]*[^:blank:]*[:blank:]*$pid[:blank:]*" | sed 's/ .*//')
-			wmctrl -i -R $winid
+            winid=$(wmctrl -l -p | grep -e "^[^:blank:]*[:blank:]*[^:blank:]*[:blank:]*$pid[:blank:]*" | sed 's/ .*//')
+            wmctrl -i -R $winid
 
 			exit 0
 		fi
diff --git a/navit/tools/cleanattr.sh b/navit/tools/cleanattr.sh
index 200db5b66..c5e36792a 100755
--- a/navit/tools/cleanattr.sh
+++ b/navit/tools/cleanattr.sh
@@ -20,8 +20,8 @@ if [ -f $TMPFILE ] ; then
 		exit 1;
 fi
 
-touch $TMPFILE
-if [ $? -ne 0 ] ; then
+if ! touch $TMPFILE
+then
 		echo "Could not write to temporary file $TEMPFILE."
 		echo "Please make sure you have write access to the temporary directory."
 		exit 1;
@@ -35,9 +35,8 @@ cp $ATTRFILE $TMPFILE
 for ATTRNAME in $ATTRLIST ; do
 		ATTR="attr_$ATTRNAME"
 
-		grep -rI $ATTR ./* > /dev/null
-
-		if [ $? -ne 0 ] ; then
+		if ! grep -rI $ATTR ./* > /dev/null
+		then
 				echo "Unused attribute: $ATTR"
 				grep -v "ATTR($ATTRNAME)" $TMPFILE > $TMPFILE2
 				mv $TMPFILE2 $TMPFILE
-- 
cgit v1.2.1


From 6f313ba86fba868d8d029d3f2596229f387d0ded Mon Sep 17 00:00:00 2001
From: Joseph Herlant <aerostitch@debian.org>
Date: Fri, 30 Aug 2019 12:12:33 -0700
Subject: refactoring:tools:remove unnecessary trailing line to make codefactor
 happy

---
 scripts/basic_upload_apks.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/basic_upload_apks.py b/scripts/basic_upload_apks.py
index b4b439536..1bd911f15 100644
--- a/scripts/basic_upload_apks.py
+++ b/scripts/basic_upload_apks.py
@@ -79,4 +79,3 @@ def main(argv):
 
 if __name__ == '__main__':
   main(sys.argv)
-
-- 
cgit v1.2.1