From 835244861191a246a83b5908b7bf7905f7c15c56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rahu=CE=BB=20D=C3=A9?= Date: Wed, 28 Sep 2022 16:42:05 +0530 Subject: [PATCH 1/5] check if supplied deps is non-empty (#1377) --- src/babashka/impl/deps.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/babashka/impl/deps.clj b/src/babashka/impl/deps.clj index 3224ebce..c6cfb413 100644 --- a/src/babashka/impl/deps.clj +++ b/src/babashka/impl/deps.clj @@ -66,7 +66,7 @@ paths) paths)] (cp/add-classpath (str/join cp/path-sep paths)))) - (let [need-deps? (or (:deps deps-map) + (let [need-deps? (or (seq (:deps deps-map)) (and (:aliases deps-map) aliases))] (when need-deps? From 0684119000e6c615c210883e919b10d6cf3560e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rahu=CE=BB=20D=C3=A9?= Date: Wed, 28 Sep 2022 19:18:35 +0530 Subject: [PATCH 2/5] Mark bb.edn load exception (#1378) * Mark bb.edn load exception * print to stderr * print with binding --- src/babashka/main.clj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/babashka/main.clj b/src/babashka/main.clj index e5bd9b4b..6b19dc77 100644 --- a/src/babashka/main.clj +++ b/src/babashka/main.clj @@ -1049,7 +1049,9 @@ Use bb run --help to show this help output. (catch java.lang.RuntimeException e (if (re-find #"No dispatch macro for: \"" (.getMessage e)) (throw (ex-info "Invalid regex literal found in EDN config, use re-pattern instead" {})) - (throw e))))) + (do (binding [*out* *err*] + (println "Error during loading bb.edn:")) + (throw e)))))) (defn main [& args] (let [[args global-opts] (parse-global-opts args) From 8170fd7675ae5c12ecdb7d0badeb41ac82234154 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Thu, 29 Sep 2022 09:31:13 +0200 Subject: [PATCH 3/5] pods: print + flush for out and err, thanks @justone --- pods | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pods b/pods index 53f79da0..decf7910 160000 --- a/pods +++ b/pods @@ -1 +1 @@ -Subproject commit 53f79da09d5da542204f3cb0161724221276dfcb +Subproject commit decf791000081ca9e6d2fbea9f20a0aa3fae902e From c081367304ad534360d6451e3cfad0355bd7a638 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Thu, 29 Sep 2022 10:05:43 +0200 Subject: [PATCH 4/5] Fix pod test --- test-resources/pod.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test-resources/pod.clj b/test-resources/pod.clj index 53394b75..698471e0 100644 --- a/test-resources/pod.clj +++ b/test-resources/pod.clj @@ -104,14 +104,14 @@ "id" id}) pod.test-pod/print (do (write - {"out" (pr-str args) + {"out" (prn-str args) "id" id}) (write {"status" ["done"] "id" id})) pod.test-pod/print-err (do (write - {"err" (pr-str args) + {"err" (prn-str args) "id" id}) (write {"status" ["done"] From c94960eac180731ae0e8e0f78f1326961c51a916 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Fri, 30 Sep 2022 11:51:06 +0200 Subject: [PATCH 5/5] deps.clj: support for CLJ_JVM_OPTS and JAVA_OPTS --- deps.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.clj b/deps.clj index d4d6d720..c8c4d79c 160000 --- a/deps.clj +++ b/deps.clj @@ -1 +1 @@ -Subproject commit d4d6d720c0d62eb3e2230fa85291a5fd68398d6a +Subproject commit c8c4d79c5fd8cb1d6e8daec4eec7b0a4d739f36c