ob-plantuml: now expanding file names before shell quoting

* lisp/ob-plantuml.el (org-babel-execute:plantuml): now expanding file
names before shell quoting
This commit is contained in:
Eric Schulte 2010-09-02 17:58:08 -06:00
parent ebad875b12
commit b0dce5a074
1 changed files with 6 additions and 3 deletions

View File

@ -60,11 +60,14 @@ This function is called by `org-babel-execute-src-block'."
(cmd (if (not org-plantuml-jar-path) (cmd (if (not org-plantuml-jar-path)
(error "`org-plantuml-jar-path' is not set") (error "`org-plantuml-jar-path' is not set")
(concat "java -jar " (concat "java -jar "
(shell-quote-argument org-plantuml-jar-path) (shell-quote-argument
(expand-file-name org-plantuml-jar-path))
" -p " cmdline " < " " -p " cmdline " < "
(shell-quote-argument in-file) (shell-quote-argument
(expand-file-name in-file))
" > " " > "
(shell-quote-argument out-file))))) (shell-quote-argument
(expand-file-name out-file))))))
(unless (file-exists-p org-plantuml-jar-path) (unless (file-exists-p org-plantuml-jar-path)
(error "Could not find plantuml.jar at %s" org-plantuml-jar-path)) (error "Could not find plantuml.jar at %s" org-plantuml-jar-path))
(with-temp-file in-file (insert (concat "@startuml\n" body "\n@enduml"))) (with-temp-file in-file (insert (concat "@startuml\n" body "\n@enduml")))