diff --git a/sci b/sci index 2e7dd0d1..4e6d8e21 160000 --- a/sci +++ b/sci @@ -1 +1 @@ -Subproject commit 2e7dd0d1bc23f4d158ea592adf23dac971d4d8d4 +Subproject commit 4e6d8e215a379e3c1a36e39dce43148c8ab0915b diff --git a/src/babashka/main.clj b/src/babashka/main.clj index e1714279..41575a6e 100644 --- a/src/babashka/main.clj +++ b/src/babashka/main.clj @@ -944,9 +944,10 @@ Use bb run --help to show this help output. :verbose debug}] (if-let [bb-edn-pods (:pods @common/bb-edn)] (fs/with-temp-dir [bb-edn-dir {}] - (let [bb-edn-resource (fs/file bb-edn-dir "bb.edn")] + (let [bb-edn-resource (fs/file bb-edn-dir "META-INF" "bb.edn")] + (fs/create-dirs (fs/parent bb-edn-resource)) (->> {:pods bb-edn-pods} pr-str (spit bb-edn-resource)) - (let [cp-with-bb-edn (str cp cp/path-sep bb-edn-dir)] + (let [cp-with-bb-edn (str bb-edn-dir cp/path-sep cp)] (uberjar/run (assoc uber-params :classpath cp-with-bb-edn))))) (uberjar/run uber-params))) @@ -970,7 +971,7 @@ Use bb run --help to show this help output. abs-path #(-> % io/file .getAbsolutePath) bb-edn-file (cond config (when (fs/exists? config) (abs-path config)) - jar (some-> jar cp/loader (cp/resource "bb.edn") .toString) + jar (some-> jar cp/loader (cp/resource "META-INF/bb.edn") .toString) :else (when (fs/exists? "bb.edn") (abs-path "bb.edn"))) bb-edn (when bb-edn-file (System/setProperty "babashka.config" bb-edn-file) diff --git a/test/babashka/uberjar_test.clj b/test/babashka/uberjar_test.clj index 4dd24d37..4476f45a 100644 --- a/test/babashka/uberjar_test.clj +++ b/test/babashka/uberjar_test.clj @@ -72,7 +72,7 @@ (not (fs/windows?)) (assoc 'pod/test-pod {:path "test-resources/pod"}))}] (tu/with-config config (tu/bb nil "uberjar" path "-m" "my.main-pod") - (let [bb-edn-entry (get-entry tmp-file "bb.edn") + (let [bb-edn-entry (get-entry tmp-file "META-INF/bb.edn") bb-edn (-> path JarFile. (.getInputStream bb-edn-entry) InputStreamReader. PushbackReader. edn/read)] (is (= #{:pods} (-> bb-edn keys set)))