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

improve snippet

Browse source
This commit is contained in:
Michiel Borkent 2022-07-29 13:04:48 +02:00
parent 781cc929dd
commit 05d105716a
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/babashka/impl/cli.clj
View file

@ -10,14 +10,16 @@
(defn exec-fn-snippet [ns var-name] (defn exec-fn-snippet [ns var-name]
(format " (format "
(do
(require '%1$s) (require '%1$s)
(require '[babashka.cli]) (require '[babashka.cli])
(def ns-meta (meta (find-ns '%1$s))) (let [
(def var-meta (meta (resolve '%1$s/%2$s))) ns-meta (meta (find-ns '%1$s))
(def cli-opts (babashka.cli/merge-opts (:org.babashka/cli ns-meta) (:org.babashka/cli var-meta))) var-meta (meta (resolve '%1$s/%2$s))
(def opts (babashka.cli/parse-opts *command-line-args* cli-opts)) cli-opts (babashka.cli/merge-opts (:org.babashka/cli ns-meta) (:org.babashka/cli var-meta))
(def task-exec-args (:exec-args (babashka.tasks/current-task))) opts (babashka.cli/parse-opts *command-line-args* cli-opts)
(def cli-exec-args (:exec-args cli-opts)) task-exec-args (:exec-args (babashka.tasks/current-task))
(def opts (babashka.cli/merge-opts cli-exec-args task-exec-args opts)) cli-exec-args (:exec-args cli-opts)
(%1$s/%2$s opts)" opts (babashka.cli/merge-opts cli-exec-args task-exec-args opts)]
(%1$s/%2$s opts)))"
ns var-name)) ns var-name))

1
src/babashka/impl/tasks.clj
View file

@ -462,7 +462,6 @@
(let [ns (namespace fq-sym) (let [ns (namespace fq-sym)
var-name (name fq-sym) var-name (name fq-sym)
snippet (cli/exec-fn-snippet ns var-name)] snippet (cli/exec-fn-snippet ns var-name)]
(prn snippet)
`(load-string ~snippet)))) `(load-string ~snippet))))
(def tasks-namespace (def tasks-namespace