Merge pull request #22 from wendelscardua/fix-sensor-args

Prevent sensor names from being splitted when they contain spaces
This commit is contained in:
Fredrik Fornwall 2018-06-14 23:45:47 +02:00 committed by GitHub
commit 1e27ad6a0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -38,7 +38,7 @@ handle_interrupt () {
cleanup () {
if [ $((FLAGS & (ALL_SENSORS_FLAG | SENSOR_FLAG))) != 0 ]; then
echo "Performing sensor cleanup"
call_api "-a cleanup"
call_api -a cleanup
else
echo "No cleanup necessary"
fi
@ -59,7 +59,7 @@ get_delay () {
}
call_api () {
/data/data/com.termux/files/usr/libexec/termux-api Sensor $@
/data/data/com.termux/files/usr/libexec/termux-api Sensor "$@"
}
set_flag () {
@ -73,16 +73,16 @@ usage_error () {
}
PARAMS=""
PARAMS=()
while getopts :h,a,c,l,s:d: option
do
case "$option" in
h) show_usage ;;
a) set_flag $ALL_SENSORS_FLAG; PARAMS="-a sensors $PARAMS --ez all true" ;;
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="$PARAMS --ei delay $OPTARG" ;;
a) set_flag $ALL_SENSORS_FLAG; PARAMS+=(-a sensors --ez all true);;
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) ;;
?) echo "$SCRIPTNAME: illegal option -$OPTARG"; exit 1;
esac
done
@ -100,4 +100,4 @@ elif [ $((FLAGS & ALL_SENSORS_FLAG)) -ne 0 ] && [ $((FLAGS & SENSOR_FLAG)) -ne 0
usage_error "Listed sensors will be ignored with -a all option!"
fi
call_api $PARAMS
call_api "${PARAMS[@]}"