refactoring

jlangch · Sep 1, 2023 · c94b108 · c94b108
1 parent 8107cdd
commit c94b108
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/src/main/resources/com/github/jlangch/venice/docker.venice b/src/main/resources/com/github/jlangch/venice/docker.venice
@@ -98,7 +98,7 @@
         (parse-output format (:out (apply docker/cmd cmdargs*))))
       (let [out    (parse-output :json (:out (docker/cmd "version -f json")))
             field  (if (== :server type) "Server" "Client")]
-        (get-in (first out) [field "Version"])))))
+        (get-in out [field "Version"])))))
 
 
 
@@ -1001,10 +1001,14 @@
 
 (defn- parse-output [format output]
   (if (= format :json)
-    (-<> (str/split-lines output)            ;; docker you're kidding
-         (str/join "," <>)
-         (str "[" <> "]")
-         (json/read-str <>))
+    ;; docker you're kidding
+    (let [lines (str/split-lines output)]
+      (if (== 1 (count lines))
+        (json/read-str output)
+        (as-> lines $
+              (str/join "," $)
+              (str "[" $ "]")
+              (json/read-str $))))
     output))