From e6905173b6f887f4c35770f10af068e08f18e8ea Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 19 Mar 2021 18:31:47 +0100 Subject: [PATCH] wip --- src/babashka/impl/deps.clj | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/babashka/impl/deps.clj b/src/babashka/impl/deps.clj index fd463bad..c6d5982a 100644 --- a/src/babashka/impl/deps.clj +++ b/src/babashka/impl/deps.clj @@ -59,16 +59,17 @@ ([deps-map {:keys [:aliases]}] (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] + (when-let [deps-map (not-empty (dissoc deps-map :paths))] + (let [deps-map (assoc-in deps-map [:aliases :org.babashka/defaults] '{:replace-paths [] ;; babashka sets paths manually :classpath-overrides {org.clojure/clojure "" org.clojure/spec.alpha "" org.clojure/core.specs.alpha ""}}) args ["-Spath" "-Sdeps" (str deps-map)] 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))))) (defn clojure