Another fix for #1472
This commit is contained in:
parent
a464b59bc2
commit
17adc69abc
1 changed files with 2 additions and 12 deletions
|
|
@ -72,21 +72,11 @@
|
||||||
(if (map? cmd)
|
(if (map? cmd)
|
||||||
[cmd (first args) (rest args)]
|
[cmd (first args) (rest args)]
|
||||||
[nil cmd args])
|
[nil cmd args])
|
||||||
opts (if-let [o (:out opts)]
|
cmd (cons cmd args)
|
||||||
(if (string? o)
|
|
||||||
(update opts :out io/file)
|
|
||||||
opts)
|
|
||||||
opts)
|
|
||||||
opts (if-let [o (:err opts)]
|
|
||||||
(if (string? o)
|
|
||||||
(update opts :err io/file)
|
|
||||||
opts)
|
|
||||||
opts)
|
|
||||||
cmd (into cmd args)
|
|
||||||
local-log-level (:log-level opts)]
|
local-log-level (:log-level opts)]
|
||||||
(sci/binding [log-level (or local-log-level @log-level)]
|
(sci/binding [log-level (or local-log-level @log-level)]
|
||||||
(apply log-info (cons "clojure" cmd))
|
(apply log-info (cons "clojure" cmd))
|
||||||
(handle-non-zero (deps/clojure cmd (merge default-opts opts)) opts))))
|
(handle-non-zero (apply deps/clojure (merge default-opts opts) cmd) opts))))
|
||||||
|
|
||||||
(defn -wait [res]
|
(defn -wait [res]
|
||||||
(when res
|
(when res
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue