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

:do

Browse source
This commit is contained in:
Michiel Borkent 2021-03-25 11:41:42 +01:00
parent 035167ab11
commit c2829fe34d
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/babashka/main.clj
View file

@ -422,7 +422,7 @@ Use -- to separate script command line args from bb command line args.
(:tasks bb-edn)) (:tasks bb-edn))
user-task (when tasks (get tasks k))] user-task (when tasks (get tasks k))]
(cond user-task (cond user-task
(resolve-task user-task {:command-line-args (next options)}) (resolve-task tasks user-task {:command-line-args (next options)})
expanded (parse-opts expanded) expanded (parse-opts expanded)
:else :else
(let [opts (loop [options options (let [opts (loop [options options
@ -532,7 +532,7 @@ Use -- to separate script command line args from bb command line args.
(let [options (next options)] (let [options (next options)]
(recur (next options) (recur (next options)
(assoc opts-map :main (first options)))) (assoc opts-map :main (first options))))
(":do") #_#_(":do")
(let [options (next options) (let [options (next options)
options (into [] (comp (partition-by #(or options (into [] (comp (partition-by #(or
(= % ":do") (= % ":do")
@ -569,7 +569,7 @@ Use -- to separate script command line args from bb command line args.
opts-map))] opts-map))]
opts)))) opts))))
(defn resolve-task [task {:keys [:command-line-args]}] (defn resolve-task [tasks task {:keys [:command-line-args]}]
(let [{:keys [:task :opts :args]} (decode-task task)] (let [{:keys [:task :opts :args]} (decode-task task)]
opts ;; not used opts ;; not used
(case task (case task
@ -588,8 +588,11 @@ Use -- to separate script command line args from bb command line args.
cmd-line-args (rest args)] cmd-line-args (rest args)]
(parse-opts (seq (map str (concat ["--main" main-arg] cmd-line-args command-line-args))))) (parse-opts (seq (map str (concat ["--main" main-arg] cmd-line-args command-line-args)))))
:do :do
{:do (map #(resolve-task tasks % nil) args)}
(error (str "No such task: " task) 1)))) ;; default
(if-let [t (get tasks task)]
(resolve-task tasks t nil)
(error (str "No such task: " task) 1)))))
(def should-load-inits? (def should-load-inits?
"if true, then we should still load preloads and user.clj" "if true, then we should still load preloads and user.clj"
@ -815,10 +818,11 @@ Use -- to separate script command line args from bb command line args.
(when-let [bb-edn @bb-edn] (deps/add-deps bb-edn))) (when-let [bb-edn @bb-edn] (deps/add-deps bb-edn)))
(let [opts (parse-opts args)] (let [opts (parse-opts args)]
(if-let [do-opts (:do opts)] (if-let [do-opts (:do opts)]
(reduce (fn [prev-exit opts] (reduce (fn [_prev-exit opts]
;; (prn :prev prev-exit) ;; (prn :prev prev-exit)
;; (prn :opts opts) ;; (prn :opts opts)
(if (pos? prev-exit) (exec opts)
#_(if (pos? prev-exit)
(case opts (case opts
([":do"] [":or-do"]) 0 ;; skipping, returning 0 ([":do"] [":or-do"]) 0 ;; skipping, returning 0
(reduced prev-exit)) (reduced prev-exit))