From a2970fcae78b9973c20bdcb78a8a4ec0170aac93 Mon Sep 17 00:00:00 2001
From: tv <tv@shackspace.de>
Date: Wed, 20 May 2015 21:34:24 +0200
Subject: lib/cac.sh cac_listservers: return maybe data

---
 infest                   | 2 +-
 lib/cac.sh               | 2 +-
 networking-configuration | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/infest b/infest
index f2ccd12f..c6d509a5 100755
--- a/infest
+++ b/infest
@@ -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
diff --git a/lib/cac.sh b/lib/cac.sh
index 7ed06012..482e4dde 100644
--- a/lib/cac.sh
+++ b/lib/cac.sh
@@ -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 b9725c7e..2cae3966 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"
 }
-- 
cgit v1.2.3