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

[#535] fix order in --uberscript

Browse source
This commit is contained in:
Michiel Borkent 2020-08-16 15:59:38 +02:00
parent 9d5f3337bc
commit 0829ccbe2e
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sci

@ -1 +1 @@
Subproject commit 74b6c7cfb732b46e04a6c6f9209c41f210f37571 Subproject commit 0da67e32e2930aa0ea18c9350b8a40fc0b9cb502

3
src/babashka/main.clj
View file

@ -517,6 +517,7 @@ If neither -e, -f, or --socket-repl are specified, then the first argument that
:imports imports :imports imports
:load-fn load-fn :load-fn load-fn
:dry-run uberscript :dry-run uberscript
:reload true
:readers core/data-readers} :readers core/data-readers}
opts (addons/future opts) opts (addons/future opts)
sci-ctx (sci/init opts) sci-ctx (sci/init opts)
@ -582,7 +583,7 @@ If neither -e, -f, or --socket-repl are specified, then the first argument that
uberscript uberscript
(let [uberscript-out uberscript] (let [uberscript-out uberscript]
(spit uberscript-out "") ;; reset file (spit uberscript-out "") ;; reset file
(doseq [s @uberscript-sources] (doseq [s (dedupe @uberscript-sources)]
(spit uberscript-out s :append true)) (spit uberscript-out s :append true))
(spit uberscript-out preloads :append true) (spit uberscript-out preloads :append true)
(spit uberscript-out expression :append true))) (spit uberscript-out expression :append true)))