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

wip

Browse source
This commit is contained in:
Michiel Borkent 2021-03-19 18:25:01 +01:00
parent 07f5e811e6
commit 6a1d48460e
2 changed files with 14 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/babashka/impl/deps.clj
View file

@ -57,7 +57,11 @@
then used to resolve dependencies in babashka." then used to resolve dependencies in babashka."
([deps-map] (add-deps deps-map nil)) ([deps-map] (add-deps deps-map nil))
([deps-map {:keys [:aliases]}] ([deps-map {:keys [:aliases]}]
(let [deps-map (assoc-in deps-map [:aliases :org.babashka/defaults] (when-let [paths (:paths deps-map)]
(cp/add-classpath (str/join cp/path-sep paths)))
(when-let [deps (:deps deps-map)]
(let [deps-map {:deps deps}
deps-map (assoc-in deps-map [:aliases :org.babashka/defaults]
'{:replace-paths [] ;; babashka sets paths manually '{:replace-paths [] ;; babashka sets paths manually
:classpath-overrides {org.clojure/clojure "" :classpath-overrides {org.clojure/clojure ""
org.clojure/spec.alpha "" org.clojure/spec.alpha ""
@ -65,7 +69,7 @@
args ["-Spath" "-Sdeps" (str deps-map)] args ["-Spath" "-Sdeps" (str deps-map)]
args (conj args (str "-A:" (str/join ":" (cons ":org.babashka/defaults" aliases)))) args (conj args (str "-A:" (str/join ":" (cons ":org.babashka/defaults" aliases))))
cp (with-out-str (apply deps/-main args))] cp (with-out-str (apply deps/-main args))]
(cp/add-classpath cp)))) (cp/add-classpath cp)))))
(defn clojure (defn clojure
"Starts clojure similar to CLI. Use `rlwrap bb` for `clj`-like invocation. "Starts clojure similar to CLI. Use `rlwrap bb` for `clj`-like invocation.

5
src/babashka/main.clj
View file

@ -753,10 +753,7 @@ Use -- to separate script command line args from bb command line args.
(handle-pipe!) (handle-pipe!)
(handle-sigint!) (handle-sigint!)
(when-let [bb-edn @bb-edn] (when-let [bb-edn @bb-edn]
(when-let [paths (:paths bb-edn)] (deps/add-deps bb-edn))
(cp/add-classpath (str/join cp/path-sep paths)))
(when-let [deps (:deps bb-edn)]
(deps/add-deps {:deps deps})))
(if-let [dev-opts (System/getenv "BABASHKA_DEV")] (if-let [dev-opts (System/getenv "BABASHKA_DEV")]
(let [{:keys [:n]} (if (= "true" dev-opts) {:n 1} (let [{:keys [:n]} (if (= "true" dev-opts) {:n 1}
(edn/read-string dev-opts)) (edn/read-string dev-opts))