2016-06-20 12:58:32 +00:00
|
|
|
;;; ob-shell.el --- Babel Functions for Shell Evaluation -*- lexical-binding: t; -*-
|
2009-03-31 23:11:17 +00:00
|
|
|
|
2016-01-09 22:12:03 +00:00
|
|
|
;; Copyright (C) 2009-2016 Free Software Foundation, Inc.
|
2009-03-31 23:11:17 +00:00
|
|
|
|
|
|
|
;; Author: Eric Schulte
|
|
|
|
;; Keywords: literate programming, reproducible research
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
|
2010-06-25 17:17:50 +00:00
|
|
|
;; This file is part of GNU Emacs.
|
2009-03-31 23:11:17 +00:00
|
|
|
|
2010-06-25 17:17:50 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2009-03-31 23:11:17 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2010-06-25 17:17:50 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
2009-03-31 23:11:17 +00:00
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
2010-06-25 17:17:50 +00:00
|
|
|
|
2009-03-31 23:11:17 +00:00
|
|
|
;; You should have received a copy of the GNU General Public License
|
2010-06-25 17:17:50 +00:00
|
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
2009-03-31 23:11:17 +00:00
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
2009-06-12 20:09:20 +00:00
|
|
|
;; Org-Babel support for evaluating shell source code.
|
2009-03-31 23:11:17 +00:00
|
|
|
|
|
|
|
;;; Code:
|
2010-06-11 23:02:42 +00:00
|
|
|
(require 'ob)
|
2009-06-12 20:09:20 +00:00
|
|
|
(require 'shell)
|
2010-07-04 21:46:13 +00:00
|
|
|
(eval-when-compile (require 'cl))
|
2010-06-13 01:50:05 +00:00
|
|
|
|
2016-05-15 21:42:47 +00:00
|
|
|
(declare-function org-babel-comint-in-buffer "ob-comint" (buffer &rest body)
|
|
|
|
t)
|
2010-06-14 23:36:46 +00:00
|
|
|
(declare-function org-babel-comint-wait-for-output "ob-comint" (buffer))
|
|
|
|
(declare-function org-babel-comint-buffer-livep "ob-comint" (buffer))
|
2016-05-15 21:42:47 +00:00
|
|
|
(declare-function org-babel-comint-with-output "ob-comint" (meta &rest body)
|
|
|
|
t)
|
2010-06-14 23:36:46 +00:00
|
|
|
(declare-function orgtbl-to-generic "org-table" (table params))
|
2009-03-31 23:11:17 +00:00
|
|
|
|
2015-07-03 14:14:25 +00:00
|
|
|
(defvar org-babel-default-header-args:shell '())
|
2010-06-25 17:12:54 +00:00
|
|
|
|
2013-12-13 23:04:41 +00:00
|
|
|
(defcustom org-babel-shell-names
|
|
|
|
'("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh")
|
2013-12-13 16:52:05 +00:00
|
|
|
"List of names of shell supported by babel shell code blocks."
|
|
|
|
:group 'org-babel
|
|
|
|
:type 'string
|
|
|
|
:initialize
|
|
|
|
(lambda (symbol value)
|
|
|
|
(set-default symbol (second value))
|
|
|
|
(mapc
|
|
|
|
(lambda (name)
|
|
|
|
(eval `(defun ,(intern (concat "org-babel-execute:" name)) (body params)
|
|
|
|
,(format "Execute a block of %s commands with Babel." name)
|
2014-06-22 09:16:41 +00:00
|
|
|
(let ((shell-file-name ,name))
|
2013-12-13 16:52:05 +00:00
|
|
|
(org-babel-execute:shell body params)))))
|
|
|
|
(second value))))
|
|
|
|
|
|
|
|
(defun org-babel-execute:shell (body params)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Execute a block of Shell commands with Babel.
|
|
|
|
This function is called by `org-babel-execute-src-block'."
|
2010-10-21 11:52:24 +00:00
|
|
|
(let* ((session (org-babel-sh-initiate-session
|
|
|
|
(cdr (assoc :session params))))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(stdin (let ((stdin (cdr (assoc :stdin params))))
|
|
|
|
(when stdin (org-babel-sh-var-to-string
|
|
|
|
(org-babel-ref-resolve stdin)))))
|
2014-02-10 03:12:18 +00:00
|
|
|
(cmdline (cdr (assoc :cmdline params)))
|
2010-10-21 11:35:05 +00:00
|
|
|
(full-body (org-babel-expand-body:generic
|
2015-07-03 14:14:25 +00:00
|
|
|
body params (org-babel-variable-assignments:shell params))))
|
2010-04-19 01:06:34 +00:00
|
|
|
(org-babel-reassemble-table
|
2014-02-10 03:12:18 +00:00
|
|
|
(org-babel-sh-evaluate session full-body params stdin cmdline)
|
2010-07-07 02:53:34 +00:00
|
|
|
(org-babel-pick-name
|
2010-10-21 11:52:24 +00:00
|
|
|
(cdr (assoc :colname-names params)) (cdr (assoc :colnames params)))
|
2010-07-07 02:53:34 +00:00
|
|
|
(org-babel-pick-name
|
2010-10-21 11:52:24 +00:00
|
|
|
(cdr (assoc :rowname-names params)) (cdr (assoc :rownames params))))))
|
2009-06-12 20:09:20 +00:00
|
|
|
|
2015-07-03 14:14:25 +00:00
|
|
|
(defun org-babel-prep-session:shell (session params)
|
2009-06-14 18:53:56 +00:00
|
|
|
"Prepare SESSION according to the header arguments specified in PARAMS."
|
2009-06-14 19:02:25 +00:00
|
|
|
(let* ((session (org-babel-sh-initiate-session session))
|
2015-07-03 14:14:25 +00:00
|
|
|
(var-lines (org-babel-variable-assignments:shell params)))
|
2009-06-14 18:53:56 +00:00
|
|
|
(org-babel-comint-in-buffer session
|
|
|
|
(mapc (lambda (var)
|
|
|
|
(insert var) (comint-send-input nil t)
|
2010-01-11 17:14:30 +00:00
|
|
|
(org-babel-comint-wait-for-output session)) var-lines))
|
|
|
|
session))
|
|
|
|
|
2015-07-03 14:14:25 +00:00
|
|
|
(defun org-babel-load-session:shell (session body params)
|
2010-01-11 17:14:30 +00:00
|
|
|
"Load BODY into SESSION."
|
|
|
|
(save-window-excursion
|
2015-07-03 14:14:25 +00:00
|
|
|
(let ((buffer (org-babel-prep-session:shell session params)))
|
2010-01-11 17:14:30 +00:00
|
|
|
(with-current-buffer buffer
|
|
|
|
(goto-char (process-mark (get-buffer-process (current-buffer))))
|
|
|
|
(insert (org-babel-chomp body)))
|
|
|
|
buffer)))
|
2009-06-14 18:53:56 +00:00
|
|
|
|
|
|
|
;; helper functions
|
2014-04-15 03:30:32 +00:00
|
|
|
(defun org-babel-variable-assignments:sh-generic
|
|
|
|
(varname values &optional sep hline)
|
2014-04-11 21:27:02 +00:00
|
|
|
"Returns a list of statements declaring the values as a generic variable."
|
|
|
|
(format "%s=%s" varname (org-babel-sh-var-to-sh values sep hline)))
|
|
|
|
|
2014-04-15 03:30:32 +00:00
|
|
|
(defun org-babel-variable-assignments:bash_array
|
|
|
|
(varname values &optional sep hline)
|
2014-04-11 21:27:02 +00:00
|
|
|
"Returns a list of statements declaring the values as a bash array."
|
2014-06-19 19:23:28 +00:00
|
|
|
(format "unset %s\ndeclare -a %s=( %s )"
|
|
|
|
varname varname
|
|
|
|
(mapconcat
|
|
|
|
(lambda (value) (org-babel-sh-var-to-sh value sep hline))
|
|
|
|
values
|
|
|
|
" ")))
|
2014-04-11 21:27:02 +00:00
|
|
|
|
2014-04-15 03:30:32 +00:00
|
|
|
(defun org-babel-variable-assignments:bash_assoc
|
|
|
|
(varname values &optional sep hline)
|
2014-04-11 21:27:02 +00:00
|
|
|
"Returns a list of statements declaring the values as bash associative array."
|
|
|
|
(format "unset %s\ndeclare -A %s\n%s"
|
|
|
|
varname varname
|
2014-06-19 19:23:28 +00:00
|
|
|
(mapconcat
|
|
|
|
(lambda (items)
|
|
|
|
(format "%s[%s]=%s"
|
|
|
|
varname
|
|
|
|
(org-babel-sh-var-to-sh (car items) sep hline)
|
|
|
|
(org-babel-sh-var-to-sh (cdr items) sep hline)))
|
|
|
|
values
|
|
|
|
"\n")))
|
2014-04-11 21:27:02 +00:00
|
|
|
|
|
|
|
(defun org-babel-variable-assignments:bash (varname values &optional sep hline)
|
|
|
|
"Represents the parameters as useful Bash shell variables."
|
|
|
|
(if (listp values)
|
2014-04-15 03:30:32 +00:00
|
|
|
(if (and (listp (car values)) (= 1 (length (car values))))
|
|
|
|
(org-babel-variable-assignments:bash_array varname values sep hline)
|
|
|
|
(org-babel-variable-assignments:bash_assoc varname values sep hline))
|
|
|
|
(org-babel-variable-assignments:sh-generic varname values sep hline)))
|
2009-06-14 18:53:56 +00:00
|
|
|
|
2015-07-03 14:14:25 +00:00
|
|
|
(defun org-babel-variable-assignments:shell (params)
|
2012-07-30 08:08:15 +00:00
|
|
|
"Return list of shell statements assigning the block's variables."
|
2013-05-19 04:55:38 +00:00
|
|
|
(let ((sep (cdr (assoc :separator params)))
|
|
|
|
(hline (when (string= "yes" (cdr (assoc :hlines params)))
|
|
|
|
(or (cdr (assoc :hline-string params))
|
|
|
|
"hline"))))
|
2010-10-14 20:36:42 +00:00
|
|
|
(mapcar
|
|
|
|
(lambda (pair)
|
2014-06-22 09:16:41 +00:00
|
|
|
(if (string-match "bash$" shell-file-name)
|
2014-04-15 03:30:32 +00:00
|
|
|
(org-babel-variable-assignments:bash
|
2014-04-11 21:27:02 +00:00
|
|
|
(car pair) (cdr pair) sep hline)
|
2014-04-15 03:30:32 +00:00
|
|
|
(org-babel-variable-assignments:sh-generic
|
|
|
|
(car pair) (cdr pair) sep hline)))
|
2015-10-29 19:26:11 +00:00
|
|
|
(org-babel--get-vars params))))
|
2010-10-14 20:36:42 +00:00
|
|
|
|
2013-05-19 04:55:38 +00:00
|
|
|
(defun org-babel-sh-var-to-sh (var &optional sep hline)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Convert an elisp value to a shell variable.
|
|
|
|
Convert an elisp var into a string of shell commands specifying a
|
|
|
|
var of the same value."
|
2014-06-19 19:23:28 +00:00
|
|
|
(concat "'" (replace-regexp-in-string
|
|
|
|
"'" "'\"'\"'"
|
|
|
|
(org-babel-sh-var-to-string var sep hline))
|
|
|
|
"'"))
|
2011-05-25 15:50:36 +00:00
|
|
|
|
2013-05-19 04:55:38 +00:00
|
|
|
(defun org-babel-sh-var-to-string (var &optional sep hline)
|
2011-05-25 15:50:36 +00:00
|
|
|
"Convert an elisp value to a string."
|
2012-08-10 14:05:26 +00:00
|
|
|
(let ((echo-var (lambda (v) (if (stringp v) v (format "%S" v)))))
|
2011-05-25 15:50:36 +00:00
|
|
|
(cond
|
2013-07-17 14:15:35 +00:00
|
|
|
((and (listp var) (or (listp (car var)) (equal (car var) 'hline)))
|
2013-05-19 04:55:38 +00:00
|
|
|
(orgtbl-to-generic var (list :sep (or sep "\t") :fmt echo-var
|
|
|
|
:hline hline)))
|
2011-05-25 15:50:36 +00:00
|
|
|
((listp var)
|
2012-08-10 14:05:26 +00:00
|
|
|
(mapconcat echo-var var "\n"))
|
|
|
|
(t (funcall echo-var var)))))
|
2009-06-12 20:09:20 +00:00
|
|
|
|
2016-06-20 12:58:32 +00:00
|
|
|
(defun org-babel-sh-initiate-session (&optional session _params)
|
2010-06-12 00:12:15 +00:00
|
|
|
"Initiate a session named SESSION according to PARAMS."
|
2010-06-15 00:52:13 +00:00
|
|
|
(when (and session (not (string= session "none")))
|
2009-11-27 19:28:34 +00:00
|
|
|
(save-window-excursion
|
|
|
|
(or (org-babel-comint-buffer-livep session)
|
2014-09-19 09:34:09 +00:00
|
|
|
(progn
|
|
|
|
(shell session)
|
2014-09-19 09:52:30 +00:00
|
|
|
;; Needed for Emacs 23 since the marker is initially
|
|
|
|
;; undefined and the filter functions try to use it without
|
|
|
|
;; checking.
|
|
|
|
(set-marker comint-last-output-start (point))
|
2014-09-19 09:34:09 +00:00
|
|
|
(get-buffer (current-buffer)))))))
|
2009-06-14 18:53:56 +00:00
|
|
|
|
2009-06-14 19:02:25 +00:00
|
|
|
(defvar org-babel-sh-eoe-indicator "echo 'org_babel_sh_eoe'"
|
2010-07-13 23:20:08 +00:00
|
|
|
"String to indicate that evaluation has completed.")
|
2009-06-14 19:02:25 +00:00
|
|
|
(defvar org-babel-sh-eoe-output "org_babel_sh_eoe"
|
2010-07-13 23:20:08 +00:00
|
|
|
"String to indicate that evaluation has completed.")
|
2009-06-12 20:09:20 +00:00
|
|
|
|
2014-02-10 03:12:18 +00:00
|
|
|
(defun org-babel-sh-evaluate (session body &optional params stdin cmdline)
|
2010-07-13 23:20:08 +00:00
|
|
|
"Pass BODY to the Shell process in BUFFER.
|
2015-09-21 04:24:12 +00:00
|
|
|
If RESULT-TYPE equals `output' then return a list of the outputs
|
|
|
|
of the statements in BODY, if RESULT-TYPE equals `value' then
|
2010-07-13 23:20:08 +00:00
|
|
|
return the value of the last statement in BODY."
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(let ((results
|
|
|
|
(cond
|
2014-02-10 03:12:18 +00:00
|
|
|
((or stdin cmdline) ; external shell script w/STDIN
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(let ((script-file (org-babel-temp-file "sh-script-"))
|
|
|
|
(stdin-file (org-babel-temp-file "sh-stdin-"))
|
|
|
|
(shebang (cdr (assoc :shebang params)))
|
|
|
|
(padline (not (string= "no" (cdr (assoc :padline params))))))
|
|
|
|
(with-temp-file script-file
|
|
|
|
(when shebang (insert (concat shebang "\n")))
|
|
|
|
(when padline (insert "\n"))
|
|
|
|
(insert body))
|
|
|
|
(set-file-modes script-file #o755)
|
2014-02-10 03:12:18 +00:00
|
|
|
(with-temp-file stdin-file (insert (or stdin "")))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(with-temp-buffer
|
|
|
|
(call-process-shell-command
|
2015-04-22 07:51:52 +00:00
|
|
|
(concat (if shebang script-file
|
|
|
|
(format "%s %s" shell-file-name script-file))
|
|
|
|
(and cmdline (concat " " cmdline)))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
stdin-file
|
2015-04-22 07:51:52 +00:00
|
|
|
(current-buffer))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(buffer-string))))
|
|
|
|
(session ; session evaluation
|
|
|
|
(mapconcat
|
|
|
|
#'org-babel-sh-strip-weird-long-prompt
|
|
|
|
(mapcar
|
|
|
|
#'org-babel-trim
|
|
|
|
(butlast
|
|
|
|
(org-babel-comint-with-output
|
|
|
|
(session org-babel-sh-eoe-output t body)
|
|
|
|
(mapc
|
|
|
|
(lambda (line)
|
|
|
|
(insert line)
|
|
|
|
(comint-send-input nil t)
|
|
|
|
(while (save-excursion
|
|
|
|
(goto-char comint-last-input-end)
|
|
|
|
(not (re-search-forward
|
|
|
|
comint-prompt-regexp nil t)))
|
|
|
|
(accept-process-output
|
|
|
|
(get-buffer-process (current-buffer)))))
|
|
|
|
(append
|
|
|
|
(split-string (org-babel-trim body) "\n")
|
|
|
|
(list org-babel-sh-eoe-indicator))))
|
|
|
|
2)) "\n"))
|
|
|
|
('otherwise ; external shell script
|
|
|
|
(if (and (cdr (assoc :shebang params))
|
|
|
|
(> (length (cdr (assoc :shebang params))) 0))
|
|
|
|
(let ((script-file (org-babel-temp-file "sh-script-"))
|
|
|
|
(shebang (cdr (assoc :shebang params)))
|
|
|
|
(padline (not (equal "no" (cdr (assoc :padline params))))))
|
|
|
|
(with-temp-file script-file
|
|
|
|
(when shebang (insert (concat shebang "\n")))
|
|
|
|
(when padline (insert "\n"))
|
|
|
|
(insert body))
|
|
|
|
(set-file-modes script-file #o755)
|
|
|
|
(org-babel-eval script-file ""))
|
2014-06-22 09:16:41 +00:00
|
|
|
(org-babel-eval shell-file-name (org-babel-trim body)))))))
|
Backport changes from Emacs revs 115081 and 115082
2013-11-12 Stefan Monnier <monnier@iro.umontreal.ca>
Address some byte-compiler warnings.
* ob-abc.el (org-babel-expand-body:abc): Use dolist.
(org-babel-execute:abc): Fix regexp quoting.
* ob-calc.el (org--var-syms): Rename from `var-syms'.
* ob-lilypond.el (ly-compile-lilyfile): Remove redundant let-binding.
* ob-table.el (sbe): Move debug declaration.
* org-clock.el (org--msg-extra): Rename from `msg-extra'.
* org.el (org-version): Avoid var name starting with _.
(org-inhibit-startup, org-called-with-limited-levels)
(org-link-search-inhibit-query, org-time-was-given)
(org-end-time-was-given, org-def, org-defdecode, org-with-time):
* org-colview.el (org-agenda-overriding-columns-format):
* org-agenda.el (org-agenda-multi, org-depend-tag-blocked)
(org-agenda-show-log-scoped):
* ob-python.el (py-which-bufname, python-shell-buffer-name):
* ob-haskell.el (org-export-copy-to-kill-ring):
* ob-exp.el (org-link-search-inhibit-query):
* ob-R.el (ess-eval-visibly-p):
* ob-core.el (org-src-window-setup): Declare before use.
(org-babel-expand-noweb-references): Remove unused `blocks-in-buffer'.
* ox-odt.el (org-odt-hfy-face-to-css):
* org-src.el (org-src-associate-babel-session, org-src-get-lang-mode):
* org-bibtex.el (org-bibtex-get, org-bibtex-ask, org-bibtex)
(org-bibtex-check):
* ob-tangle.el (org-babel-tangle, org-babel-spec-to-string)
(org-babel-tangle-single-block, org-babel-tangle-comment-links):
* ob-table.el (sbe):
* ob-sqlite.el (org-babel-sqlite-expand-vars):
* ob-sql.el (org-babel-sql-expand-vars):
* ob-shen.el (org-babel-execute:shen):
* ob-sh.el (org-babel-execute:sh, org-babel-sh-evaluate):
* ob-scala.el (org-babel-scala-evaluate):
* ob-ruby.el (org-babel-ruby-table-or-string)
(org-babel-ruby-evaluate):
* ob-python.el (org-babel-python-table-or-string)
(org-babel-python-evaluate-external-process)
(org-babel-python-evaluate-session):
* ob-picolisp.el (org-babel-execute:picolisp):
* ob-perl.el (org-babel-perl-evaluate):
* ob-maxima.el (org-babel-execute:maxima):
* ob-lisp.el (org-babel-execute:lisp):
* ob-java.el (org-babel-execute:java):
* ob-io.el (org-babel-io-evaluate):
* ob-haskell.el (org-babel-execute:haskell):
* ob-fortran.el (org-babel-execute:fortran):
* ob-exp.el (org-babel-exp-code):
* ob-emacs-lisp.el (org-babel-execute:emacs-lisp):
* ob-ditaa.el (org-babel-execute:ditaa):
* ob-core.el (org-babel-execute-src-block, org-babel-sha1-hash)
(org-babel-parse-header-arguments, org-babel-reassemble-table)
(org-babel-goto-src-block-head, org-babel-mark-block)
(org-babel-expand-noweb-references, org-babel-script-escape)
(org-babel-process-file-name):
* ob-clojure.el (org-babel-execute:clojure):
* ob-calc.el (org-babel-execute:calc):
* ob-awk.el (org-babel-execute:awk):
* ob-abc.el (org-babel-execute:abc):
* ob-R.el (org-babel-expand-body:R):
* ob-C.el (org-babel-C-execute): Avoid deprecated ((lambda) ...).
2013-11-12 Glenn Morris <rgm@gnu.org>
* ox-html.el (org-html-scripts): Add 2013 to copyright years.
(org-html-infojs-template): Copyright holder to FSF.
2013-11-12 19:57:31 +00:00
|
|
|
(when results
|
|
|
|
(let ((result-params (cdr (assoc :result-params params))))
|
|
|
|
(org-babel-result-cond result-params
|
|
|
|
results
|
|
|
|
(let ((tmp-file (org-babel-temp-file "sh-")))
|
|
|
|
(with-temp-file tmp-file (insert results))
|
|
|
|
(org-babel-import-elisp-from-file tmp-file)))))))
|
2009-03-31 23:11:17 +00:00
|
|
|
|
2009-06-14 19:02:25 +00:00
|
|
|
(defun org-babel-sh-strip-weird-long-prompt (string)
|
2010-06-12 00:12:15 +00:00
|
|
|
"Remove prompt cruft from a string of shell output."
|
2009-06-12 22:20:23 +00:00
|
|
|
(while (string-match "^% +[\r\n$]+ *" string)
|
|
|
|
(setq string (substring string (match-end 0))))
|
|
|
|
string)
|
|
|
|
|
2013-12-13 16:54:48 +00:00
|
|
|
(provide 'ob-shell)
|
2010-06-25 17:17:50 +00:00
|
|
|
|
2011-08-15 18:04:38 +00:00
|
|
|
|
2010-06-25 17:17:50 +00:00
|
|
|
|
2013-12-13 16:54:48 +00:00
|
|
|
;;; ob-shell.el ends here
|