ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2012-09-29 23:46:30 +02:00
parent a5483f2d39 86e515d7cc
commit 50caf97422
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/ob-sh.el
View File

@ -190,7 +190,8 @@ return the value of the last statement in BODY."
(list org-babel-sh-eoe-indicator)))) (list org-babel-sh-eoe-indicator))))
2)) "\n")) 2)) "\n"))
('otherwise ; external shell script ('otherwise ; external shell script
(if (cdr (assoc :shebang params)) (if (and (cdr (assoc :shebang params))
(> (length (cdr (assoc :shebang params))) 0))
(let ((script-file (org-babel-temp-file "sh-script-")) (let ((script-file (org-babel-temp-file "sh-script-"))
(shebang (cdr (assoc :shebang params))) (shebang (cdr (assoc :shebang params)))
(padline (not (string= "no" (cdr (assoc :padline params)))))) (padline (not (string= "no" (cdr (assoc :padline params))))))