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

dude

Browse source
This commit is contained in:
Michiel Borkent 2024-01-12 18:33:22 +01:00
parent ecbbd7ab84
commit 707e430bc5
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/babashka/main.clj
View file

@ -722,9 +722,10 @@ Use bb run --help to show this help output.
(let [opt (first options)] (let [opt (first options)]
(if (and opt (and (fs/exists? opt) (if (and opt (and (fs/exists? opt)
(not (fs/directory? opt)))) (not (fs/directory? opt))))
[(next options) (assoc opts-map [nil (assoc opts-map
(if (str/ends-with? opt ".jar") (if (str/ends-with? opt ".jar")
:jar :file) opt)] :jar :file) opt
:command-line-args (next options))]
[options opts-map]))) [options opts-map])))
(defn parse-opts (defn parse-opts
@ -1152,6 +1153,7 @@ Use bb run --help to show this help output.
(:jar opts)) (:jar opts))
(parse-file-opt args opts) (parse-file-opt args opts)
[args opts]) [args opts])
;; _ (prn :args args :opts opts)
abs-path #(-> % io/file .getAbsolutePath) abs-path #(-> % io/file .getAbsolutePath)
config (cond config (cond
config (if (fs/exists? config) (abs-path config) config (if (fs/exists? config) (abs-path config)

1
test-resources/script_with_overlapping_opts.clj Normal file
View file

@ -0,0 +1 @@
(prn (first *command-line-args*))

4
test/babashka/main_test.clj
View file

@ -1,6 +1,7 @@
(ns babashka.main-test (ns babashka.main-test
{:clj-kondo/config '{:linters {:unresolved-symbol {:exclude [working?]}}}} {:clj-kondo/config '{:linters {:unresolved-symbol {:exclude [working?]}}}}
(:require (:require
[babashka.fs :as fs]
[babashka.main :as main] [babashka.main :as main]
[babashka.test-utils :as test-utils] [babashka.test-utils :as test-utils]
[clojure.edn :as edn] [clojure.edn :as edn]
@ -71,7 +72,8 @@
(-> (let [[_ opts] (main/parse-file-opt ["-e" "(prn :foo)"] {})] (-> (let [[_ opts] (main/parse-file-opt ["-e" "(prn :foo)"] {})]
(main/parse-opts ["-e" "(prn :foo)"] opts))))) (main/parse-opts ["-e" "(prn :foo)"] opts)))))
(is (= {:file "foo", :command-line-args ["README.md"]} (is (= {:file "foo", :command-line-args ["README.md"]}
(main/parse-opts ["README.md"] {:file "foo"}))))) (main/parse-opts ["README.md"] {:file "foo"})))
(prn (bb nil (fs/file "test-resources" "script_with_overlapping_opts.clj") "--version"))))
(deftest version-test (deftest version-test
(is (= [1 0 0] (main/parse-version "1.0.0-SNAPSHOT"))) (is (= [1 0 0] (main/parse-version "1.0.0-SNAPSHOT")))