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:31:47 +01:00
parent 6a1d48460e
commit e6905173b6
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -59,16 +59,17 @@
([deps-map {:keys [:aliases]}] ([deps-map {:keys [:aliases]}]
(when-let [paths (:paths deps-map)] (when-let [paths (:paths deps-map)]
(cp/add-classpath (str/join cp/path-sep paths))) (cp/add-classpath (str/join cp/path-sep paths)))
(when-let [deps (:deps deps-map)] (when-let [deps-map (not-empty (dissoc deps-map :paths))]
(let [deps-map {:deps deps} (let [deps-map (assoc-in deps-map [:aliases :org.babashka/defaults]
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 ""
org.clojure/core.specs.alpha ""}}) org.clojure/core.specs.alpha ""}})
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 (str/trim cp)
cp (str/replace cp (re-pattern (str cp/path-sep "+$")) "")]
(cp/add-classpath cp))))) (cp/add-classpath cp)))))
(defn clojure (defn clojure