Merge branch 'master' into spec1
This commit is contained in:
commit
988a21b73b
5 changed files with 8 additions and 6 deletions
2
deps.clj
2
deps.clj
|
|
@ -1 +1 @@
|
||||||
Subproject commit d4d6d720c0d62eb3e2230fa85291a5fd68398d6a
|
Subproject commit c8c4d79c5fd8cb1d6e8daec4eec7b0a4d739f36c
|
||||||
2
pods
2
pods
|
|
@ -1 +1 @@
|
||||||
Subproject commit 53f79da09d5da542204f3cb0161724221276dfcb
|
Subproject commit decf791000081ca9e6d2fbea9f20a0aa3fae902e
|
||||||
|
|
@ -66,7 +66,7 @@
|
||||||
paths)
|
paths)
|
||||||
paths)]
|
paths)]
|
||||||
(cp/add-classpath (str/join cp/path-sep paths))))
|
(cp/add-classpath (str/join cp/path-sep paths))))
|
||||||
(let [need-deps? (or (:deps deps-map)
|
(let [need-deps? (or (seq (:deps deps-map))
|
||||||
(and (:aliases deps-map)
|
(and (:aliases deps-map)
|
||||||
aliases))]
|
aliases))]
|
||||||
(when need-deps?
|
(when need-deps?
|
||||||
|
|
|
||||||
|
|
@ -1049,7 +1049,9 @@ Use bb run --help to show this help output.
|
||||||
(catch java.lang.RuntimeException e
|
(catch java.lang.RuntimeException e
|
||||||
(if (re-find #"No dispatch macro for: \"" (.getMessage e))
|
(if (re-find #"No dispatch macro for: \"" (.getMessage e))
|
||||||
(throw (ex-info "Invalid regex literal found in EDN config, use re-pattern instead" {}))
|
(throw (ex-info "Invalid regex literal found in EDN config, use re-pattern instead" {}))
|
||||||
(throw e)))))
|
(do (binding [*out* *err*]
|
||||||
|
(println "Error during loading bb.edn:"))
|
||||||
|
(throw e))))))
|
||||||
|
|
||||||
(defn main [& args]
|
(defn main [& args]
|
||||||
(let [[args global-opts] (parse-global-opts args)
|
(let [[args global-opts] (parse-global-opts args)
|
||||||
|
|
|
||||||
|
|
@ -104,14 +104,14 @@
|
||||||
"id" id})
|
"id" id})
|
||||||
pod.test-pod/print
|
pod.test-pod/print
|
||||||
(do (write
|
(do (write
|
||||||
{"out" (pr-str args)
|
{"out" (prn-str args)
|
||||||
"id" id})
|
"id" id})
|
||||||
(write
|
(write
|
||||||
{"status" ["done"]
|
{"status" ["done"]
|
||||||
"id" id}))
|
"id" id}))
|
||||||
pod.test-pod/print-err
|
pod.test-pod/print-err
|
||||||
(do (write
|
(do (write
|
||||||
{"err" (pr-str args)
|
{"err" (prn-str args)
|
||||||
"id" id})
|
"id" id})
|
||||||
(write
|
(write
|
||||||
{"status" ["done"]
|
{"status" ["done"]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue