From 6a1d48460e1e766c23d9929d725c94125578252d Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 19 Mar 2021 18:25:01 +0100
Subject: [PATCH] wip

---
 src/babashka/impl/deps.clj | 22 +++++++++++++---------
 src/babashka/main.clj      |  5 +----
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/babashka/impl/deps.clj b/src/babashka/impl/deps.clj
index e2e39640..fd463bad 100644
--- a/src/babashka/impl/deps.clj
+++ b/src/babashka/impl/deps.clj
@@ -57,15 +57,19 @@
   then used to resolve dependencies in babashka."
   ([deps-map] (add-deps deps-map nil))
   ([deps-map {:keys [:aliases]}]
-   (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/add-classpath cp))))
+   (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
+                                :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/add-classpath cp)))))
 
 (defn clojure
   "Starts clojure similar to CLI. Use `rlwrap bb` for `clj`-like invocation.
diff --git a/src/babashka/main.clj b/src/babashka/main.clj
index 64ef5353..7bc2cef7 100644
--- a/src/babashka/main.clj
+++ b/src/babashka/main.clj
@@ -753,10 +753,7 @@ Use -- to separate script command line args from bb command line args.
   (handle-pipe!)
   (handle-sigint!)
   (when-let [bb-edn @bb-edn]
-    (when-let [paths (:paths bb-edn)]
-      (cp/add-classpath (str/join cp/path-sep paths)))
-    (when-let [deps (:deps bb-edn)]
-      (deps/add-deps {:deps deps})))
+    (deps/add-deps bb-edn))
   (if-let [dev-opts (System/getenv "BABASHKA_DEV")]
     (let [{:keys [:n]} (if (= "true" dev-opts) {:n 1}
                            (edn/read-string dev-opts))