[#811] Fix --classpath when no additional args are passed

src/babashka/main.clj

@@ -437,34 +437,9 @@ When no eval opts or subcommand is provided, the implicit subcommand is repl.")
       ("--classpath" "-cp") [(nnext options) (second options)]
       [options nil])))
 
-(defn parse-opts
+(defn parse-args [args opts-map]
-  ([options] (parse-opts options nil))
+  (loop [options args
-  ([options opts]
+         opts-map opts-map]
-   (let [[options classpath] (parse-global-opts options)
-         opts (if classpath (assoc opts :classpath classpath)
-                  opts)
-         opt (first options)
-         tasks (into #{} (map str) (keys (:tasks @common/bb-edn)))]
-     (when opt
-       ;; FILE > TASK > SUBCOMMAND
-       (cond
-         (fs/regular-file? opt)
-         (if (str/ends-with? opt ".jar")
-           {:classpath classpath
-            :jar opt
-            :command-line-args (next options)}
-           {:classpath classpath
-            :file opt
-            :command-line-args (next options)})
-         (contains? tasks opt)
-         {:run opt
-          :classpath classpath
-          :command-line-args (rest options)}
-         (command? opt)
-         (recur (cons (str "--" opt) (next options)) opts)
-         :else
-         (let [opts (loop [options options
-                           opts-map opts]
     (if options
       (let [opt (first options)]
         (case opt
@@ -594,8 +569,35 @@ When no eval opts or subcommand is provided, the implicit subcommand is repl.")
                          :jar
                          :file) opt
                        :command-line-args (next options)))))))
-                        opts-map))]
+      opts-map)))
-           opts))))))
+
+(defn parse-opts
+  ([options] (parse-opts options nil))
+  ([options opts-map]
+   (let [[options classpath] (parse-global-opts options)
+         opts-map (if classpath (assoc opts-map :classpath classpath)
+                      opts-map)
+         opt (first options)
+         tasks (into #{} (map str) (keys (:tasks @common/bb-edn)))]
+     (if-not opt opts-map
+             ;; FILE > TASK > SUBCOMMAND
+             (cond
+               (fs/regular-file? opt)
+               (if (str/ends-with? opt ".jar")
+                 {:classpath classpath
+                  :jar opt
+                  :command-line-args (next options)}
+                 {:classpath classpath
+                  :file opt
+                  :command-line-args (next options)})
+               (contains? tasks opt)
+               {:run opt
+                :classpath classpath
+                :command-line-args (rest options)}
+               (command? opt)
+               (recur (cons (str "--" opt) (next options)) opts-map)
+               :else
+               (parse-args options opts-map))))))
 
 (def env (atom {}))
 

test/babashka/main_test.clj

@@ -46,7 +46,8 @@
   (is (= '("-e" "1") (bb nil "-e" "*command-line-args*" "--" "-e" "1")))
   (let [v (bb nil "--describe")]
     (is (:babashka/version v))
-    (is (:feature/xml v))))
+    (is (:feature/xml v)))
+  (is (= "src" (:classpath (main/parse-opts ["--classpath" "src"])))))
 
 (deftest version-test
   (is (= [1 0 0] (main/parse-version "1.0.0-SNAPSHOT")))