From 4a58ad8c9fbc983bea726b1b1215dbf9c08cbaa1 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Sat, 20 Mar 2021 18:18:45 +0100 Subject: [PATCH] wip --- src/babashka/impl/deps.clj | 2 +- src/babashka/main.clj | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/babashka/impl/deps.clj b/src/babashka/impl/deps.clj index c6d5982a..08d6ff20 100644 --- a/src/babashka/impl/deps.clj +++ b/src/babashka/impl/deps.clj @@ -59,7 +59,7 @@ ([deps-map {:keys [:aliases]}] (when-let [paths (:paths deps-map)] (cp/add-classpath (str/join cp/path-sep paths))) - (when-let [deps-map (not-empty (dissoc deps-map :paths))] + (when-let [deps-map (not-empty (dissoc deps-map :paths :tasks))] (let [deps-map (assoc-in deps-map [:aliases :org.babashka/defaults] '{:replace-paths [] ;; babashka sets paths manually :classpath-overrides {org.clojure/clojure "" diff --git a/src/babashka/main.clj b/src/babashka/main.clj index a8a2a26d..70b3792a 100644 --- a/src/babashka/main.clj +++ b/src/babashka/main.clj @@ -650,8 +650,15 @@ Use -- to separate script command line args from bb command line args. preloads (when @should-load-inits? (some-> (System/getenv "BABASHKA_PRELOADS") (str/trim))) [expressions exit-code] (cond expressions [expressions nil] - main [[(format "(ns user (:require [%1$s])) (apply %1$s/-main *command-line-args*)" - main)] nil] + main + (let [sym (symbol main) + ns? (namespace sym) + ns (or ns? sym) + var-name (if ns? + (name sym) + "-main")] + [[(format "(ns user (:require [%1$s])) (apply %1$s/%2$s *command-line-args*)" + ns var-name)] nil]) file (try [[(read-file file)] nil] (catch Exception e (error-handler e {:expression expressions