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

io/resource should return nil for non-relative paths

Browse source
This commit is contained in:
Michiel Borkent 2020-06-10 22:55:07 +02:00
parent 64f3d2cc7b
commit 26939ff677
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/babashka/main.clj
View file

@ -481,7 +481,9 @@ If neither -e, -f, or --socket-repl are specified, then the first argument that
(assoc-in ['clojure.java.io 'resource]
(fn [path]
(when-let [{:keys [:loader]} @cp-state]
(cp/getResource loader [path] {:url? true}))))
(try (cp/getResource loader [path] {:url? true})
;; non-relative paths don't work
(catch Exception _e nil)))))
(assoc-in ['user (with-meta '*input*
(when-not stream?
{:sci.impl/deref! true}))] input-var)

4
test/babashka/classpath_test.clj
View file

@ -55,4 +55,6 @@
(.deleteOnExit tmp-file)
(bb nil "--classpath" "logo" "-e" (format "(io/copy (io/input-stream (io/resource \"icon.png\")) (io/file \"%s\"))" (.getPath tmp-file)))
(is (= (.length (io/file "logo" "icon.png"))
(.length tmp-file)))))
(.length tmp-file))))
(testing "No exception on absolute path"
(is (nil? (bb nil "(io/resource \"/tmp\")")))))