luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tasks: use process wrapper

Browse source
This commit is contained in:
Michiel Borkent 2022-05-04 19:32:11 +02:00
parent 1e8ec5285a
commit 200a01fe85
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/babashka/deps.clj
View file

@ -1,5 +1,6 @@
(ns babashka.deps (ns babashka.deps
(:require [babashka.process :as p] (:require [babashka.impl.process :as pp]
[babashka.process :as p]
[borkdude.deps :as deps] [borkdude.deps :as deps]
[sci.core :as sci])) [sci.core :as sci]))
@ -41,8 +42,8 @@
deps/*env* (:env opts) deps/*env* (:env opts)
deps/*extra-env* (:extra-env opts) deps/*extra-env* (:extra-env opts)
deps/*process-fn* (fn deps/*process-fn* (fn
([cmd] (p/process cmd opts)) ([cmd] (pp/process cmd opts))
([cmd _] (p/process cmd opts))) ([cmd _] (pp/process cmd opts)))
deps/*exit-fn* (fn deps/*exit-fn* (fn
([_]) ([_])
([_exit-code msg] ([_exit-code msg]

3
src/babashka/impl/tasks.clj
View file

@ -1,6 +1,7 @@
(ns babashka.impl.tasks (ns babashka.impl.tasks
(:require [babashka.deps :as deps] (:require [babashka.deps :as deps]
[babashka.impl.common :refer [ctx bb-edn debug]] [babashka.impl.common :refer [ctx bb-edn debug]]
[babashka.impl.process :as pp]
[babashka.process :as p] [babashka.process :as p]
[clojure.core.async :refer [<!!]] [clojure.core.async :refer [<!!]]
[clojure.java.io :as io] [clojure.java.io :as io]
@ -85,7 +86,7 @@
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 cmd) (apply log-info cmd)
(handle-non-zero (p/process prev cmd (merge default-opts opts)) opts)))) (handle-non-zero (pp/process prev cmd (merge default-opts opts)) opts))))
(defn clojure [cmd & args] (defn clojure [cmd & args]
(let [[opts cmd args] (let [[opts cmd args]