summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Schulte <schulte.eric@gmail.com>2010-09-02 12:47:54 -0600
committerEric Schulte <schulte.eric@gmail.com>2010-09-02 12:47:54 -0600
commitebad875b122e6e39bc29967bc2ef8c9ee5d5c641 (patch)
tree4dffe9225d8df64f8ab1e00a599a5aa15908f3d7
parent7b188f7da5797da7ae225b89239f87adf0135959 (diff)
downloadorg-mode-ebad875b122e6e39bc29967bc2ef8c9ee5d5c641.tar.gz
ob-plantuml: explicitly check `org-plantuml-jar-path' before use
* lisp/ob-plantuml.el (org-babel-execute:plantuml): explicitly check `org-plantuml-jar-path' before use
-rw-r--r--lisp/ob-plantuml.el14
1 files changed, 8 insertions, 6 deletions
diff --git a/lisp/ob-plantuml.el b/lisp/ob-plantuml.el
index c5045de..cb5ca12 100644
--- a/lisp/ob-plantuml.el
+++ b/lisp/ob-plantuml.el
@@ -57,12 +57,14 @@ This function is called by `org-babel-execute-src-block'."
(out-file (cdr (assoc :file params)))
(cmdline (cdr (assoc :cmdline params)))
(in-file (org-babel-temp-file "plantuml-"))
- (cmd (concat "java -jar "
- (shell-quote-argument org-plantuml-jar-path)
- " -p " cmdline " < "
- (shell-quote-argument in-file)
- " > "
- (shell-quote-argument out-file))))
+ (cmd (if (not org-plantuml-jar-path)
+ (error "`org-plantuml-jar-path' is not set")
+ (concat "java -jar "
+ (shell-quote-argument org-plantuml-jar-path)
+ " -p " cmdline " < "
+ (shell-quote-argument in-file)
+ " > "
+ (shell-quote-argument out-file)))))
(unless (file-exists-p 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")))