App: remove some superflous debuglog()

[staging/windowmanager.git] / scripts / wm-request

diff --git a/scripts/wm-request b/scripts/wm-request
index 618da62..b9a703a 100755 (executable)
--- a/scripts/wm-request
+++ b/scripts/wm-request
@@ -1,12 +1,31 @@
 #!/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
+UUIDFILE=/tmp/wm-request-uuid
+if ! which uuidgen 2>/dev/null 1>&2
+then
+   echo "c7c638c5-d097-4eb4-9012-a1e4c25b9808" > $UUIDFILE
+else
+   if ! [ -f $UUIDFILE ]
+   then
+      uuidgen > $UUIDFILE
+   fi
+fi
+UUID="`cat $UUIDFILE`"
+
+for i in afb-client-demo
 do
    which $i 2>/dev/null 1>&2 || { echo "Program $i is missing" >&2; exit 1; }
 done
@@ -15,7 +34,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,24 +53,15 @@ fi
 verb=$1
 shift
 
-args=""
-for i in "$@"
-do
-   args="$i"
-done
-
-if [ "$args" ]
+set +u
+args=
+if [ "$1" ]
 then
-   args="?$args"
+   set -u
+   args='{"drawing_name":"'"$1"'"}'
+   shift
 fi
 
-UUIDFILE=/tmp/wm-request-uuid
-if ! [ -f $UUIDFILE ]
-then
-   uuidgen > $UUIDFILE
-fi
-UUID="`cat $UUIDFILE`"
-
-curl -H "x-afb-uuid: $UUID" -s http://localhost:1234/api/winman/${verb}${args} | json_pretty
+afb-client-demo -H ws://localhost:1700/api\?token=wm\&uuid=$UUID winman $verb $args
 
 # vim:set ft=sh: