X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=scripts%2Fwm-request;h=c8ab188f5eaad69f003fc29c89f583f81d3df945;hb=f4607b245556213eba320bb5e82262acf7967955;hp=618da62ff2708b0f60f99899d7bad896726622e3;hpb=6e444881b679e72388f4bc76d5372f62f7f61145;p=staging%2Fwindowmanager.git

diff --git a/scripts/wm-request b/scripts/wm-request
index 618da62..c8ab188 100755
--- a/scripts/wm-request
+++ b/scripts/wm-request
@@ -1,12 +1,19 @@
 #!/bin/sh
 
+nopygments=0
+if [ "$1" = "-p" ]
+then
+   nopygments=1
+   shift
+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
@@ -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 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
@@ -34,17 +41,6 @@ fi
 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
@@ -52,6 +48,13 @@ then
 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: