wm-request: enable the use of pygments if available

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

diff --git a/scripts/wm-request b/scripts/wm-request
index c95962f..2ecae0e 100755 (executable)
--- a/scripts/wm-request
+++ b/scripts/wm-request
@@ -48,18 +48,11 @@ done
 
 set -eu
 
-if which python 2>/dev/null 1>&2 && echo '{ "test": "1" }' | python -m json.tool 2>/dev/null 1>&2
+if [ $nopygments = 0 ] && which pygmentize 2>/dev/null 1>&2
 then
-   if [ $nopygments = 0 ] && which pygmentize 2>/dev/null 1>&2
-   then
-      json_pretty() {
-         python -m json.tool | pygmentize -l json
-      }
-   else
-      json_pretty() {
-         python -m json.tool
-      }
-   fi
+   json_pretty() {
+      pygmentize -l json
+   }
 else
    json_pretty() {
       cat
@@ -70,14 +63,12 @@ verb=$1
 shift
 
 set +u
-args=
 if [ "$1" ]
 then
    set -u
    args='{"drawing_name":"'"$1"'"}'
-   shift
 fi
 
-afb-client-demo -H ws://localhost:1700/api\?token=wm\&uuid=$UUID winman $verb $args
+afb-client-demo -H ws://localhost:1700/api\?token=wm\&uuid=$UUID winman $verb $args | json_pretty
 
 # vim:set ft=sh: