diff options
| author |   Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-09-13 14:39:30 +0200 |
|---|---|---|
| committer | Marcus Fritzsch <marcus_fritzsch@mentor.com> | 2017-09-14 14:04:51 +0200 |
| commit | 7f553b1990b5456663e0320c89e3c0aecc0328d7 (patch) | |
| tree | 98db81d8bcab7d282c61d47d71e5377e217e2b60 /scripts | |
| parent | f09cbfb256460bc934f1df1cef2939a35e032bab (diff) | |
wm-request: enable the use of pygments if available
Signed-off-by: Marcus Fritzsch <marcus_fritzsch@mentor.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/wm-request | 19 |
1 files changed, 5 insertions, 14 deletions
diff --git a/scripts/wm-request b/scripts/wm-request index c95962f..2ecae0e 100755 --- 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: |