luciano/babashka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes for issue reported by @thiagokokada

Browse source
This commit is contained in:
Michiel Borkent 2021-12-27 21:31:13 +01:00
parent ec7a6785d9
commit 1912b921df
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/babashka/impl/deps.clj
View file

@ -60,18 +60,16 @@
([deps-map] (add-deps deps-map nil)) ([deps-map] (add-deps deps-map nil))
([deps-map {:keys [:aliases :env :extra-env :force]}] ([deps-map {:keys [:aliases :env :extra-env :force]}]
(when-let [paths (:paths deps-map)] (when-let [paths (:paths deps-map)]
(let [paths (let [deps-root (:deps-root @bb-edn) (let [paths (if-let [deps-root (:deps-root @bb-edn)]
deps-root (fs/absolutize deps-root) (let [deps-root (fs/absolutize deps-root)
;; cwd (fs/absolutize ".") paths (mapv #(str (fs/file deps-root %)) paths)]
;; rel (fs/relativize cwd f) paths)
paths (mapv #(str (fs/file deps-root %)) paths)]
paths)] paths)]
(cp/add-classpath (str/join cp/path-sep paths)))) (cp/add-classpath (str/join cp/path-sep paths))))
(when-let [deps-map (not-empty (dissoc deps-map (when-let [deps-map (not-empty (dissoc deps-map
;; paths are added manually above ;; paths are added manually above
;; extra-paths are added as :paths in tasks
:paths :paths
;; extra-paths are transformed to :deps in task handling
:extra-paths
:tasks :raw :min-bb-version))] :tasks :raw :min-bb-version))]
(binding [*print-namespace-maps* false] (binding [*print-namespace-maps* false]
(let [deps-map (assoc-in deps-map [:aliases :org.babashka/defaults] (let [deps-map (assoc-in deps-map [:aliases :org.babashka/defaults]

12
src/babashka/main.clj
View file

@ -920,17 +920,19 @@ Use bb run --help to show this help output.
(defn main [& args] (defn main [& args]
(let [[args global-opts] (parse-global-opts args) (let [[args global-opts] (parse-global-opts args)
bb-edn-file (or (:config global-opts) config (:config global-opts)
bb-edn-file (or config
"bb.edn") "bb.edn")
bb-edn (when (fs/exists? bb-edn-file) bb-edn (when (fs/exists? bb-edn-file)
(let [raw-string (slurp bb-edn-file) (let [raw-string (slurp bb-edn-file)
edn (edn/read-string raw-string) edn (edn/read-string raw-string)
edn (assoc edn edn (assoc edn
:raw raw-string :raw raw-string
:file bb-edn-file :file bb-edn-file)
:deps-root edn (if-let [deps-root (or (:deps-root global-opts)
(or (:deps-root global-opts) (some-> config fs/parent))]
(str (fs/parent bb-edn-file))))] (assoc edn :deps-root deps-root)
edn)]
(vreset! common/bb-edn edn))) (vreset! common/bb-edn edn)))
min-bb-version (:min-bb-version bb-edn)] min-bb-version (:min-bb-version bb-edn)]
(when min-bb-version (when min-bb-version

3
test/babashka/bb_edn_test.clj
View file

@ -7,8 +7,7 @@
[babashka.test-utils :as test-utils] [babashka.test-utils :as test-utils]
[clojure.edn :as edn] [clojure.edn :as edn]
[clojure.string :as str] [clojure.string :as str]
[clojure.test :as test :refer [deftest is testing]] [clojure.test :as test :refer [deftest is testing]]))
[sci.core :as sci]))
(defn bb [& args] (defn bb [& args]
(let [args (map str args) (let [args (map str args)