fix: Fix to work with invoke-tool correctly

cf. #261
liquidz · Sep 20, 2024 · 0411d20 · 0411d20
1 parent 197c707
commit 0411d20
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/src/antq/core.clj b/src/antq/core.clj
@@ -231,9 +231,13 @@
                   :latest-name verified-name))
         deps))
 
+(defn- system-exit
+  [n]
+  (System/exit n))
+
 (defn exit
   [outdated-deps]
-  (System/exit (if (seq outdated-deps) 1 0)))
+  (system-exit (if (seq outdated-deps) 1 0)))
 
 (defn fetch-deps
   [options]
@@ -303,7 +307,7 @@
       errors
       (do (doseq [e errors]
             (log/error e))
-          (System/exit 1))
+          (system-exit 1))
 
       (seq deps)
       (let [alog (log/start-async-logger!)
@@ -323,7 +327,7 @@
 
       :else
       (do (log/info "No project file")
-          (System/exit 1)))))
+          (system-exit 1)))))
 
 (defn -main
   [& args]

diff --git a/src/antq/tool.clj b/src/antq/tool.clj
@@ -51,7 +51,11 @@
   [& [options]]
   (let [options (prepare-options options)]
     (binding [log/*verbose* (:verbose options false)]
-      (core/main* options nil))))
+      (with-redefs [core/system-exit (fn [n]
+                                       (when (not= 0 n)
+                                         (throw (ex-info "Exited" {:code n})))
+                                       n)]
+        (core/main* options nil)))))
 
 (defn help
   [& _]