Code Review
/
staging
/
windowmanager.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
App: special-case (de)activation for main_surface
[staging/windowmanager.git]
/
scripts
/
wm-request
diff --git
a/scripts/wm-request
b/scripts/wm-request
index
618da62
..
c8ab188
100755
(executable)
--- a/
scripts/wm-request
+++ b/
scripts/wm-request
@@
-1,12
+1,19
@@
#!/bin/sh
#!/bin/sh
+nopygments=0
+if [ "$1" = "-p" ]
+then
+ nopygments=1
+ shift
+fi
+
if ! [ "$1" ]
then
echo "Usage: $0 VERB [ARGS]" >&2
exit 1
fi
if ! [ "$1" ]
then
echo "Usage: $0 VERB [ARGS]" >&2
exit 1
fi
-for i in uuidgen
curl
+for i in uuidgen
afb-client-demo
do
which $i 2>/dev/null 1>&2 || { echo "Program $i is missing" >&2; exit 1; }
done
do
which $i 2>/dev/null 1>&2 || { echo "Program $i is missing" >&2; exit 1; }
done
@@
-15,7
+22,7
@@
set -eu
if which python 2>/dev/null 1>&2 && echo '{ "test": "1" }' | python -m json.tool 2>/dev/null 1>&2
then
if which python 2>/dev/null 1>&2 && echo '{ "test": "1" }' | python -m json.tool 2>/dev/null 1>&2
then
- if which pygmentize 2>/dev/null 1>&2
+ if
[ $nopygments = 0 ] &&
which pygmentize 2>/dev/null 1>&2
then
json_pretty() {
python -m json.tool | pygmentize -l json
then
json_pretty() {
python -m json.tool | pygmentize -l json
@@
-34,17
+41,6
@@
fi
verb=$1
shift
verb=$1
shift
-args=""
-for i in "$@"
-do
- args="$i"
-done
-
-if [ "$args" ]
-then
- args="?$args"
-fi
-
UUIDFILE=/tmp/wm-request-uuid
if ! [ -f $UUIDFILE ]
then
UUIDFILE=/tmp/wm-request-uuid
if ! [ -f $UUIDFILE ]
then
@@
-52,6
+48,13
@@
then
fi
UUID="`cat $UUIDFILE`"
fi
UUID="`cat $UUIDFILE`"
-curl -H "x-afb-uuid: $UUID" -s http://localhost:1234/api/winman/${verb}${args} | json_pretty
+args=
+if [ "$1" ]
+then
+ args='{"drawing_name":"'"$1"'"}'
+ shift
+fi
+
+afb-client-demo -H ws://localhost:1700/api\?token=wm\&uuid=$UUID winman $verb $args
# vim:set ft=sh:
# vim:set ft=sh: