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

diff --git a/scripts/wm-request b/scripts/wm-request
index 618da62..c95962f 100755
--- a/scripts/wm-request
+++ b/scripts/wm-request
@@ -1,12 +1,47 @@
 #!/bin/sh
 
+#
+# Copyright (C) 2017 Mentor Graphics Development (Deutschland) GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+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 +50,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 +69,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: