shellcheck most scripts

one thing left to do is unifying and standardizing the way the argument string for the final call to termux-api is built.
termux · Oct 25, 2019 · ab18640 · ab18640
1 parent b21388c
commit ab18640
Show file tree

Hide file tree

Showing 35 changed files with 58 additions and 58 deletions.
diff --git a/scripts/termux-audio-info b/scripts/termux-audio-info
@@ -15,7 +15,7 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-battery-status b/scripts/termux-battery-status
@@ -15,7 +15,7 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-brightness b/scripts/termux-brightness
@@ -17,7 +17,7 @@ if ! [[ $1 =~ ^([0-9]+)|auto$ ]]; then
     show_usage
 fi
 
-if [ $1 == auto ]; then
+if [ "$1" == auto ]; then
 ARGS="--ez auto true"
 else
 ARGS="--ei brightness $1 --ez auto false"

diff --git a/scripts/termux-call-log b/scripts/termux-call-log
@@ -24,7 +24,7 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-camera-info b/scripts/termux-camera-info
@@ -15,7 +15,7 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-camera-photo b/scripts/termux-camera-photo
@@ -19,12 +19,12 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# = 0 ]; then echo "$SCRIPTNAME: missing file argument"; exit 1; fi
 if [ $# != 1 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 
-touch $1
+touch "$1"
 PARAMS="$PARAMS --es file `realpath $1`"
 
 /data/data/com.termux/files/usr/libexec/termux-api CameraPhoto $PARAMS
diff --git a/scripts/termux-clipboard-get b/scripts/termux-clipboard-get
@@ -15,7 +15,7 @@ do
 	?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-clipboard-set b/scripts/termux-clipboard-set
@@ -15,7 +15,7 @@ do
 	?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 CMD="/data/data/com.termux/files/usr/libexec/termux-api Clipboard -e api_version 2 --ez set true"
 if [ $# = 0 ]; then

diff --git a/scripts/termux-contact-list b/scripts/termux-contact-list
@@ -15,7 +15,7 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-dialog b/scripts/termux-dialog
@@ -142,7 +142,7 @@ list_widgets() {
     echo
 
     for w in "${widgets[@]}"; do
-        widget_usage $w
+        widget_usage "$w"
         echo
     done
 }
@@ -183,14 +183,14 @@ parse_options() {
 options_error () {
     echo -e "ERROR: Invalid option(s) detected for '$1'\n"
     echo "Usage '$1'"
-    widget_usage $1
+    widget_usage "$1"
     exit 1
 }
 
 if [ $# -eq 0 ]; then
     WIDGET=$DEFAULT_WIDGET
 # First argument wasn't a widget
-elif ! has_widget $1; then
+elif ! has_widget "$1"; then
     # we didn't receive a widget as an argument, check to see if we
     # at least options (even if they're illegal)
     if ! [[ $1 =~ -[a-z] ]]; then
@@ -211,35 +211,35 @@ case "$WIDGET" in
     # Text (default) if no widget specified
     "text")
         if [ $((FLAGS & (RANGE_FLAG | VALUES_FLAG))) -ne 0 ]; then
-            options_error $WIDGET
+            options_error "$WIDGET"
         fi
 
         if [ $((FLAGS & MULTI_LINE_FLAG)) -ne 0 ] && [ $((FLAGS & NUM_FLAG)) -ne 0 ]; then
-            options_error $WIDGET
+            options_error "$WIDGET"
         fi
         ;;
 
     "confirm")
         if [ $((FLAGS & (MULTI_LINE_FLAG | PASS_FLAG | RANGE_FLAG | VALUES_FLAG | NUM_FLAG))) -ne 0 ]; then
-            options_error $WIDGET
+            options_error "$WIDGET"
         fi
         ;;
 
     "counter")
         if [ $((FLAGS & (MULTI_LINE_FLAG | PASS_FLAG | VALUES_FLAG | NUM_FLAG))) -ne 0 ]; then
-            options_error $WIDGET
+            options_error "$WIDGET"
         fi
         ;;
 
     "speech")
         if [ $((FLAGS & (MULTI_LINE_FLAG | PASS_FLAG | RANGE_FLAG | VALUES_FLAG | NUM_FLAG))) -ne 0 ]; then
-            options_error $WIDGET
+            options_error "$WIDGET"
         fi
         ;;
 
     "date" | "time")
         if [ $((FLAGS & (HINT_FLAG | MULTI_LINE_FLAG | PASS_FLAG | RANGE_FLAG | VALUES_FLAG | NUM_FLAG))) -ne 0 ]; then
-            options_error $WIDGET
+            options_error "$WIDGET"
         fi
         ;;
 
@@ -250,7 +250,7 @@ case "$WIDGET" in
         fi
 
         if [ $((FLAGS & (HINT_FLAG | MULTI_LINE_FLAG | PASS_FLAG | RANGE_FLAG | NUM_FLAG))) -ne 0 ]; then
-            options_error $WIDGET
+            options_error "$WIDGET"
         fi
         ;;
 

diff --git a/scripts/termux-download b/scripts/termux-download
@@ -24,7 +24,7 @@ do
 	?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# -lt 1 ]; then echo "$SCRIPTNAME: no url specified"; exit 1; fi
 if [ $# -gt 1 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
@@ -34,6 +34,6 @@ URL_TO_DOWNLOAD="$1"
 set --
 if [ -n "$ARG_D" ]; then set -- "$@" $ARG_D "$OPT_D"; fi
 if [ -n "$ARG_T" ]; then set -- "$@" $ARG_T "$OPT_T"; fi
-set -- "$@" $URL_TO_DOWNLOAD
+set -- "$@" "$URL_TO_DOWNLOAD"
 
 /data/data/com.termux/files/usr/libexec/termux-api Download "$@"
diff --git a/scripts/termux-infrared-frequencies b/scripts/termux-infrared-frequencies
@@ -15,7 +15,7 @@ do
 	?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-infrared-transmit b/scripts/termux-infrared-transmit
@@ -18,7 +18,7 @@ do
 	?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ -z "$FREQUENCY" ]; then echo "$SCRIPTNAME: No frequency specified"; exit 1; fi
 

diff --git a/scripts/termux-location b/scripts/termux-location
@@ -36,12 +36,12 @@ while getopts :hr:p: option
 do
     case "$option" in
         h) show_usage;;
-        r) validate_request $OPTARG; PARAMS="$PARAMS --es request $OPTARG";;
-        p) validate_provider $OPTARG; PARAMS="$PARAMS --es provider $OPTARG";;
+        r) validate_request "$OPTARG"; PARAMS="$PARAMS --es request $OPTARG";;
+        p) validate_provider "$OPTARG"; PARAMS="$PARAMS --es provider $OPTARG";;
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-media-scan b/scripts/termux-media-scan
@@ -18,7 +18,7 @@ get_paths() {
 			if [[ "$ARG" =~ ^/ ]]; then
 				echo "$ARG"
 			else
-				echo "`pwd`/$ARG"
+				echo "$(pwd)/$ARG"
 			fi
 		fi
 	done
@@ -34,7 +34,7 @@ do
 		?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
 	esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# = 0 ]; then echo "$SCRIPTNAME: missing file argument"; exit 1; fi
 

diff --git a/scripts/termux-notification-list b/scripts/termux-notification-list
@@ -15,7 +15,7 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-notification-remove b/scripts/termux-notification-remove
@@ -15,8 +15,8 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 1 ]; then echo "$SCRIPTNAME: no notification id specified"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api NotificationRemove --es id $1
+/data/data/com.termux/files/usr/libexec/termux-api NotificationRemove --es id "$1"
diff --git a/scripts/termux-sensor b/scripts/termux-sensor
@@ -77,7 +77,7 @@ set_flag () {
 }
 
 usage_error () {
-	echo "ERROR: $@"
+	echo "ERROR: $*"
 	show_usage
 	exit 1
 }
@@ -92,8 +92,8 @@ do
 		c) set_flag $CLEANUP_FLAG; PARAMS=(-a cleanup) ;;
 		l) set_flag $LIST_FLAG; PARAMS=(-a list) ;;
 		s) set_flag $SENSOR_FLAG; get_sensors "$OPTARG"; PARAMS+=(-a sensors --es sensors "$OPTARG") ;;
-		d) set_flag $DELAY_FLAG; get_delay $OPTARG; PARAMS+=(--ei delay $OPTARG) ;;
-		n) set_flag $LIMIT_FLAG; get_limit $OPTARG; PARAMS+=(--ei limit $OPTARG) ;;
+		d) set_flag $DELAY_FLAG; get_delay "$OPTARG"; PARAMS+=(--ei delay "$OPTARG") ;;
+		n) set_flag $LIMIT_FLAG; get_limit "$OPTARG"; PARAMS+=(--ei limit "$OPTARG") ;;
 		?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
 	esac
 done

diff --git a/scripts/termux-share b/scripts/termux-share
@@ -30,14 +30,14 @@ while getopts :ha:c:dt: option
 do
     case "$option" in
         h) show_usage;;
-        a) validate_share $OPTARG; PARAMS="$PARAMS --es action $OPTARG";;
+        a) validate_share "$OPTARG"; PARAMS="$PARAMS --es action $OPTARG";;
         c) PARAMS="$PARAMS --es content-type $OPTARG";;
         d) PARAMS="$PARAMS --ez default-receiver true";;
         t) PARAMS="$PARAMS --es title $OPTARG";;
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# -gt 1 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-sms-list b/scripts/termux-sms-list
@@ -33,7 +33,7 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-sms-send b/scripts/termux-sms-send
@@ -18,7 +18,7 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ -z "$RECIPIENTS" ]; then
     echo "$SCRIPTNAME: no recipient number given"; exit 1;
@@ -28,5 +28,5 @@ CMD="/data/data/com.termux/files/usr/libexec/termux-api SmsSend $RECIPIENTS"
 if [ $# = 0 ]; then
     $CMD
 else
-    echo $@ | $CMD
+    echo "$@" | $CMD
 fi
diff --git a/scripts/termux-speech-to-text b/scripts/termux-speech-to-text
@@ -17,7 +17,7 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-storage-get b/scripts/termux-storage-get
@@ -16,9 +16,9 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# -gt 1 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 if [ $# -lt 1 ]; then echo "$SCRIPTNAME: no output file specified"; exit 1; fi
 
-/data/data/com.termux/files/usr/libexec/termux-api StorageGet --es file "`realpath "$1"`"
+/data/data/com.termux/files/usr/libexec/termux-api StorageGet --es file "$(realpath "$1")"
diff --git a/scripts/termux-telephony-call b/scripts/termux-telephony-call
@@ -15,7 +15,7 @@ do
 	?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# = 1 ]; then
 	/data/data/com.termux/files/usr/libexec/termux-api TelephonyCall --es number "$1"

diff --git a/scripts/termux-telephony-cellinfo b/scripts/termux-telephony-cellinfo
@@ -15,7 +15,7 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-telephony-deviceinfo b/scripts/termux-telephony-deviceinfo
@@ -15,7 +15,7 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi
 

diff --git a/scripts/termux-toast b/scripts/termux-toast
@@ -26,12 +26,12 @@ do
         ?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 CMD="/data/data/com.termux/files/usr/libexec/termux-api Toast $PARAMS"
 
 if [ $# = 0 ]; then
     $CMD
 else
-    echo $@ | $CMD
+    echo "$@" | $CMD
 fi
diff --git a/scripts/termux-torch b/scripts/termux-torch
@@ -16,9 +16,9 @@ fi
 
 PARAMS=""
 
-if [ $1 = 'on' ]; then
+if [ "$1" = on ]; then
 	PARAMS="--ez enabled true"
-elif [ $1 = 'off' ]; then
+elif [ "$1" = off ]; then
 	PARAMS="--ez enabled false"
 else
 	echo "Illegal parameter: $1"

diff --git a/scripts/termux-tts-engines b/scripts/termux-tts-engines
@@ -15,7 +15,7 @@ do
 	?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
     esac
 done
-shift $(($OPTIND-1))
+shift $((OPTIND-1))
 
 if [ $# != 0 ]; then echo "$SCRIPTNAME: too many arguments"; exit 1; fi