Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

awesome-client: handle multiple args (#2551) 

`awesome-client 'return 1' 'return 2'` would only run the first command.

This also fixes other issues reported by shellcheck, and uses `read`
directly to allow `shellcheck` to parse that construct correctly.
This commit is contained in:
Daniel Hahler 2019-01-10 19:10:11 +01:00 committed by GitHub
parent ac34a687c0
commit f75dacb504
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/awesome-client
View File

@ -17,12 +17,12 @@ then
then then
if [ "$A_RERUN" = "" ] if [ "$A_RERUN" = "" ]
then then
A_RERUN="no" exec $AWESOME_RLWRAP $0 "$@" A_RERUN="no" exec "$AWESOME_RLWRAP" "$0" "$@"
fi fi
READ_CMD="read" READ_ARGS=""
else else
# No rlwrap: use bash's readline. # No rlwrap: use bash's readline.
READ_CMD="read -e" READ_ARGS="-e"
fi fi
fi fi
@ -76,13 +76,13 @@ then
fi fi
done done
# run arguments # run arguments
for arg in "$ARGS" ; do for arg in "${ARGS[@]}"; do
a_dbus_send "$arg" a_dbus_send "$arg"
done done
elif [ -t 0 ] elif [ -t 0 ]
then then
FATAL_ERRORS=0 FATAL_ERRORS=0
while $READ_CMD -p "awesome# " -r line while read $READ_ARGS -p "awesome# " -r line
do do
if [ "$line" = "" ]; then if [ "$line" = "" ]; then
continue continue