diff options
author | tv <tv@krebsco.de> | 2015-05-20 21:34:24 +0200 |
---|---|---|
committer | tv <tv@krebsco.de> | 2015-05-20 21:34:24 +0200 |
commit | fc870549e7bb85d1482877784853d31e39a6fe09 (patch) | |
tree | b01c4227dcd0b3246bce107f67b8afc20e94b9d1 | |
parent | 4fae1fdb0d2b7769a8ba6468eee79d109c00d8ab (diff) |
lib/cac.sh cac_listservers: return maybe data
-rwxr-xr-x | infest | 2 | ||||
-rw-r--r-- | lib/cac.sh | 2 | ||||
-rwxr-xr-x | networking-configuration | 2 |
3 files changed, 3 insertions, 3 deletions
@@ -22,7 +22,7 @@ main() { listservers=$(cac_listservers) config=$(echo $listservers \ - | jq -r ".data|map(select(.servername == \"$cac_servername\"))[]") + | jq -r ".[]|select(.servername==\"$cac_servername\")") serverstatus=$(echo $config | jq -r .status) case $serverstatus in @@ -4,7 +4,7 @@ cac_listservers() {( listservers=$(_cac_get_api_v1 listservers) status=$(echo "$listservers" | jq -r .status) if [ "$status" = ok ]; then - echo "$listservers" + echo "$listservers" | jq -r .data else echo "$0: bad listservers status: $status" >&2 exit 1 diff --git a/networking-configuration b/networking-configuration index b9725c7..2cae396 100755 --- a/networking-configuration +++ b/networking-configuration @@ -23,7 +23,7 @@ main() { listservers=$(cac_listservers) config=$(echo $listservers \ - | jq -r ".data|map(select(.servername == \"$cac_servername\"))[]") + | jq -r ".[]|select(.servername==\"$cac_servername\")") print_networking_configuraton "$config" } |