From 05d105716a3a9bf32d43e2bc48b61c18c44ac472 Mon Sep 17 00:00:00 2001
From: Michiel Borkent <michielborkent@gmail.com>
Date: Fri, 29 Jul 2022 13:04:48 +0200
Subject: [PATCH] improve snippet

---
 src/babashka/impl/cli.clj   | 18 ++++++++++--------
 src/babashka/impl/tasks.clj |  1 -
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/babashka/impl/cli.clj b/src/babashka/impl/cli.clj
index 0d199c5d..49d986d7 100644
--- a/src/babashka/impl/cli.clj
+++ b/src/babashka/impl/cli.clj
@@ -10,14 +10,16 @@
 
 (defn exec-fn-snippet [ns var-name]
   (format "
+(do
 (require '%1$s)
 (require '[babashka.cli])
-(def ns-meta (meta (find-ns '%1$s)))
-(def var-meta (meta (resolve '%1$s/%2$s)))
-(def cli-opts (babashka.cli/merge-opts (:org.babashka/cli ns-meta) (:org.babashka/cli var-meta)))
-(def opts (babashka.cli/parse-opts *command-line-args* cli-opts))
-(def task-exec-args (:exec-args (babashka.tasks/current-task)))
-(def cli-exec-args (:exec-args cli-opts))
-(def opts (babashka.cli/merge-opts cli-exec-args task-exec-args opts))
-(%1$s/%2$s opts)"
+(let [
+ns-meta (meta (find-ns '%1$s))
+var-meta (meta (resolve '%1$s/%2$s))
+cli-opts (babashka.cli/merge-opts (:org.babashka/cli ns-meta) (:org.babashka/cli var-meta))
+opts (babashka.cli/parse-opts *command-line-args* cli-opts)
+task-exec-args (:exec-args (babashka.tasks/current-task))
+cli-exec-args (:exec-args cli-opts)
+opts (babashka.cli/merge-opts cli-exec-args task-exec-args opts)]
+(%1$s/%2$s opts)))"
           ns var-name))
diff --git a/src/babashka/impl/tasks.clj b/src/babashka/impl/tasks.clj
index eeb2a08f..830bcb77 100644
--- a/src/babashka/impl/tasks.clj
+++ b/src/babashka/impl/tasks.clj
@@ -462,7 +462,6 @@
    (let [ns (namespace fq-sym)
          var-name (name fq-sym)
          snippet (cli/exec-fn-snippet ns var-name)]
-     (prn snippet)
      `(load-string ~snippet))))
 
 (def tasks-namespace