yogsototh/leiningen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1090 from djpowell/win-path-quoting

Browse source 
Fix for incorrect escaping of parameters on Windows
This commit is contained in:
Michael Klishin 2013-03-23 06:42:03 -07:00
commit b654e354f6
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
leiningen-core/src/leiningen/core/eval.clj
View file

@ -174,13 +174,12 @@ leiningen.core.utils/platform-nullsink instead."
(.resurrect System/in))
exit-value)))))
;; work around java's command line handling on windows
;; http://bit.ly/9c6biv This isn't perfect, but works for what's
;; currently being passed; see http://www.perlmonks.org/?node_id=300286
;; for some of the landmines involved in doing it properly
(defn- form-string [form eval-in]
(if (and (= (get-os) :windows) (not= :trampoline eval-in))
(let [s (pr-str (pr-str form))] (subs s 1 (dec (.length s))))
;; On windows if a parameter is in double quotes, then all we need
;; to worry about are double quotes, which we must escape by
;; doubling them.
(string/replace (pr-str form) "\"" "\"\"")
(pr-str form)))
(defn- classpath-arg [project]