diff options
Diffstat (limited to 'lisp/ob-shell.el')
| -rw-r--r-- | lisp/ob-shell.el | 87 |
1 files changed, 49 insertions, 38 deletions
diff --git a/lisp/ob-shell.el b/lisp/ob-shell.el index 527e6f5..74b6c7e 100644 --- a/lisp/ob-shell.el +++ b/lisp/ob-shell.el @@ -1,4 +1,4 @@ -;;; ob-shell.el --- org-babel functions for shell evaluation +;;; ob-shell.el --- Babel Functions for Shell Evaluation -*- lexical-binding: t; -*- ;; Copyright (C) 2009-2016 Free Software Foundation, Inc. @@ -28,49 +28,60 @@ ;;; Code: (require 'ob) (require 'shell) -(eval-when-compile (require 'cl)) +(require 'cl-lib) -(declare-function org-babel-comint-in-buffer "ob-comint" (buffer &rest body)) +(declare-function org-babel-comint-in-buffer "ob-comint" (buffer &rest body) + t) (declare-function org-babel-comint-wait-for-output "ob-comint" (buffer)) (declare-function org-babel-comint-buffer-livep "ob-comint" (buffer)) -(declare-function org-babel-comint-with-output "ob-comint" (meta &rest body)) +(declare-function org-babel-comint-with-output "ob-comint" (meta &rest body) + t) +(declare-function org-trim "org" (s &optional keep-lead)) (declare-function orgtbl-to-generic "org-table" (table params)) (defvar org-babel-default-header-args:shell '()) +(defvar org-babel-shell-names) + +(defun org-babel-shell-initialize () + "Define execution functions associated to shell names. +This function has to be called whenever `org-babel-shell-names' +is modified outside the Customize interface." + (interactive) + (dolist (name org-babel-shell-names) + (eval `(defun ,(intern (concat "org-babel-execute:" name)) + (body params) + ,(format "Execute a block of %s commands with Babel." name) + (let ((shell-file-name ,name)) + (org-babel-execute:shell body params)))))) (defcustom org-babel-shell-names '("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh") - "List of names of shell supported by babel shell code blocks." + "List of names of shell supported by babel shell code blocks. +Call `org-babel-shell-initialize' when modifying this variable +outside the Customize interface." :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) - (let ((shell-file-name ,name)) - (org-babel-execute:shell body params))))) - (second value)))) + :type '(repeat (string :tag "Shell name: ")) + :set (lambda (symbol value) + (set-default symbol value) + (org-babel-shell-initialize))) (defun org-babel-execute:shell (body params) "Execute a block of Shell commands with Babel. This function is called by `org-babel-execute-src-block'." (let* ((session (org-babel-sh-initiate-session - (cdr (assoc :session params)))) - (stdin (let ((stdin (cdr (assoc :stdin params)))) + (cdr (assq :session params)))) + (stdin (let ((stdin (cdr (assq :stdin params)))) (when stdin (org-babel-sh-var-to-string (org-babel-ref-resolve stdin))))) - (cmdline (cdr (assoc :cmdline params))) + (cmdline (cdr (assq :cmdline params))) (full-body (org-babel-expand-body:generic body params (org-babel-variable-assignments:shell params)))) (org-babel-reassemble-table (org-babel-sh-evaluate session full-body params stdin cmdline) (org-babel-pick-name - (cdr (assoc :colname-names params)) (cdr (assoc :colnames params))) + (cdr (assq :colname-names params)) (cdr (assq :colnames params))) (org-babel-pick-name - (cdr (assoc :rowname-names params)) (cdr (assoc :rownames params)))))) + (cdr (assq :rowname-names params)) (cdr (assq :rownames params)))))) (defun org-babel-prep-session:shell (session params) "Prepare SESSION according to the header arguments specified in PARAMS." @@ -131,18 +142,18 @@ This function is called by `org-babel-execute-src-block'." (defun org-babel-variable-assignments:shell (params) "Return list of shell statements assigning the block's variables." - (let ((sep (cdr (assoc :separator params))) - (hline (when (string= "yes" (cdr (assoc :hlines params))) - (or (cdr (assoc :hline-string params)) + (let ((sep (cdr (assq :separator params))) + (hline (when (string= "yes" (cdr (assq :hlines params))) + (or (cdr (assq :hline-string params)) "hline")))) (mapcar (lambda (pair) - (if (string-match "bash$" shell-file-name) + (if (string-suffix-p "bash" shell-file-name) (org-babel-variable-assignments:bash (car pair) (cdr pair) sep hline) (org-babel-variable-assignments:sh-generic (car pair) (cdr pair) sep hline))) - (mapcar #'cdr (org-babel-get-header params :var))))) + (org-babel--get-vars params)))) (defun org-babel-sh-var-to-sh (var &optional sep hline) "Convert an elisp value to a shell variable. @@ -157,14 +168,14 @@ var of the same value." "Convert an elisp value to a string." (let ((echo-var (lambda (v) (if (stringp v) v (format "%S" v))))) (cond - ((and (listp var) (or (listp (car var)) (equal (car var) 'hline))) + ((and (listp var) (or (listp (car var)) (eq (car var) 'hline))) (orgtbl-to-generic var (list :sep (or sep "\t") :fmt echo-var :hline hline))) ((listp var) (mapconcat echo-var var "\n")) (t (funcall echo-var var))))) -(defun org-babel-sh-initiate-session (&optional session params) +(defun org-babel-sh-initiate-session (&optional session _params) "Initiate a session named SESSION according to PARAMS." (when (and session (not (string= session "none"))) (save-window-excursion @@ -192,8 +203,8 @@ return the value of the last statement in BODY." ((or stdin cmdline) ; external shell script w/STDIN (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)))))) + (shebang (cdr (assq :shebang params))) + (padline (not (string= "no" (cdr (assq :padline params)))))) (with-temp-file script-file (when shebang (insert (concat shebang "\n"))) (when padline (insert "\n")) @@ -212,7 +223,7 @@ return the value of the last statement in BODY." (mapconcat #'org-babel-sh-strip-weird-long-prompt (mapcar - #'org-babel-trim + #'org-trim (butlast (org-babel-comint-with-output (session org-babel-sh-eoe-output t body) @@ -227,24 +238,24 @@ return the value of the last statement in BODY." (accept-process-output (get-buffer-process (current-buffer))))) (append - (split-string (org-babel-trim body) "\n") + (split-string (org-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)) + (if (and (cdr (assq :shebang params)) + (> (length (cdr (assq :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)))))) + (shebang (cdr (assq :shebang params))) + (padline (not (equal "no" (cdr (assq :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 "")) - (org-babel-eval shell-file-name (org-babel-trim body))))))) + (org-babel-eval shell-file-name (org-trim body))))))) (when results - (let ((result-params (cdr (assoc :result-params params)))) + (let ((result-params (cdr (assq :result-params params)))) (org-babel-result-cond result-params results (let ((tmp-file (org-babel-temp-file "sh-"))) |