2017-06-21 11:20:20 +00:00
|
|
|
|
;;; ob-shell.el --- Babel Functions for Shell Evaluation -*- lexical-binding: t; -*-
|
|
|
|
|
|
2019-01-01 00:59:58 +00:00
|
|
|
|
;; Copyright (C) 2009-2019 Free Software Foundation, Inc.
|
2017-06-21 11:20:20 +00:00
|
|
|
|
|
|
|
|
|
;; Author: Eric Schulte
|
|
|
|
|
;; Keywords: literate programming, reproducible research
|
2018-03-27 21:34:41 +00:00
|
|
|
|
;; Homepage: https://orgmode.org
|
2017-06-21 11:20:20 +00:00
|
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
|
|
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
|
|
|
;; it under the terms of the GNU General Public License as published by
|
|
|
|
|
;; 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,
|
|
|
|
|
;; 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.
|
|
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2017-06-21 11:20:20 +00:00
|
|
|
|
|
|
|
|
|
;;; Commentary:
|
|
|
|
|
|
|
|
|
|
;; Org-Babel support for evaluating shell source code.
|
|
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
(require 'ob)
|
|
|
|
|
(require 'shell)
|
|
|
|
|
(require 'cl-lib)
|
|
|
|
|
|
|
|
|
|
(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)
|
|
|
|
|
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))))
|
|
|
|
|
(eval `(defalias ',(intern (concat "org-babel-variable-assignments:" name))
|
|
|
|
|
'org-babel-variable-assignments:shell
|
|
|
|
|
,(format "Return list of %s statements assigning to the block's \
|
|
|
|
|
variables."
|
|
|
|
|
name)))))
|
|
|
|
|
|
|
|
|
|
(defcustom org-babel-shell-names
|
|
|
|
|
'("sh" "bash" "csh" "ash" "dash" "ksh" "mksh" "posh")
|
|
|
|
|
"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 '(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 (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 (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 (assq :colname-names params)) (cdr (assq :colnames params)))
|
|
|
|
|
(org-babel-pick-name
|
|
|
|
|
(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."
|
|
|
|
|
(let* ((session (org-babel-sh-initiate-session session))
|
|
|
|
|
(var-lines (org-babel-variable-assignments:shell params)))
|
|
|
|
|
(org-babel-comint-in-buffer session
|
|
|
|
|
(mapc (lambda (var)
|
|
|
|
|
(insert var) (comint-send-input nil t)
|
|
|
|
|
(org-babel-comint-wait-for-output session)) var-lines))
|
|
|
|
|
session))
|
|
|
|
|
|
|
|
|
|
(defun org-babel-load-session:shell (session body params)
|
|
|
|
|
"Load BODY into SESSION."
|
|
|
|
|
(save-window-excursion
|
|
|
|
|
(let ((buffer (org-babel-prep-session:shell session params)))
|
|
|
|
|
(with-current-buffer buffer
|
|
|
|
|
(goto-char (process-mark (get-buffer-process (current-buffer))))
|
|
|
|
|
(insert (org-babel-chomp body)))
|
|
|
|
|
buffer)))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; Helper functions
|
|
|
|
|
(defun org-babel--variable-assignments:sh-generic
|
|
|
|
|
(varname values &optional sep hline)
|
lisp/*.el: Fix typos and improve some docstrings
* lisp/auth-source.el (auth-source-backend-parse-parameters)
(auth-source-search-collection)
(auth-source-secrets-listify-pattern)
(auth-source--decode-octal-string, auth-source-plstore-search):
* lisp/registry.el (registry-lookup)
(registry-lookup-breaks-before-lexbind)
(registry-lookup-secondary, registry-lookup-secondary-value)
(registry-search, registry-delete, registry-size, registry-full)
(registry-insert, registry-reindex, registry-prune)
(registry-collect-prune-candidates):
* lisp/subr.el (nbutlast, process-live-p):
* lisp/tab-bar.el (tab-bar-list):
* lisp/cedet/ede/linux.el (ede-linux--get-archs)
(ede-linux--include-path, ede-linux-load):
* lisp/erc/erc-log.el (erc-log-all-but-server-buffers):
* lisp/erc/erc-pcomplete.el (pcomplete-erc-commands)
(pcomplete-erc-ops, pcomplete-erc-not-ops, pcomplete-erc-nicks)
(pcomplete-erc-all-nicks, pcomplete-erc-channels)
(pcomplete-erc-command-name, pcomplete-erc-parse-arguments):
* lisp/eshell/em-term.el (eshell-visual-command-p):
* lisp/gnus/gnus-cache.el (gnus-cache-fully-p):
* lisp/gnus/nnmail.el (nnmail-get-active)
(nnmail-fancy-expiry-target):
* lisp/mail/mail-utils.el (mail-string-delete):
* lisp/mail/supercite.el (sc-hdr, sc-valid-index-p):
* lisp/net/ange-ftp.el (ange-ftp-use-smart-gateway-p):
* lisp/net/nsm.el (nsm-save-fingerprint-maybe)
(nsm-network-same-subnet, nsm-should-check):
* lisp/net/rcirc.el (rcirc-looking-at-input):
* lisp/net/tramp-cache.el (tramp-get-hash-table):
* lisp/net/tramp-compat.el (tramp-compat-process-running-p):
* lisp/net/tramp-smb.el (tramp-smb-get-share)
(tramp-smb-get-localname, tramp-smb-read-file-entry)
(tramp-smb-get-cifs-capabilities, tramp-smb-get-stat-capability):
* lisp/net/zeroconf.el (zeroconf-list-service-names)
(zeroconf-list-service-types, zeroconf-list-services)
(zeroconf-get-host, zeroconf-get-domain)
(zeroconf-get-host-domain):
* lisp/nxml/rng-xsd.el (rng-xsd-compile)
(rng-xsd-make-date-time-regexp, rng-xsd-convert-date-time):
* lisp/obsolete/erc-hecomplete.el (erc-hecomplete)
(erc-command-list, erc-complete-at-prompt):
* lisp/org/ob-scheme.el (org-babel-scheme-get-buffer-impl):
* lisp/org/ob-shell.el (org-babel--variable-assignments:sh-generic)
(org-babel--variable-assignments:bash_array)
(org-babel--variable-assignments:bash_assoc)
(org-babel--variable-assignments:bash):
* lisp/org/org-clock.el (org-day-of-week):
* lisp/progmodes/cperl-mode.el (cperl-char-ends-sub-keyword-p):
* lisp/progmodes/gud.el (gud-find-c-expr, gud-innermost-expr)
(gud-prev-expr, gud-next-expr):
* lisp/textmodes/table.el (table--at-cell-p, table--probe-cell)
(table--get-cell-justify-property)
(table--get-cell-valign-property)
(table--put-cell-justify-property)
(table--put-cell-valign-property): Fix typos.
* lisp/so-long.el (fboundp): Doc fix.
(so-long-mode-line-info, so-long-mode)
(so-long--check-header-modes): Fix typos.
* lisp/emulation/viper-mous.el (viper-surrounding-word)
(viper-mouse-click-get-word): Fix typos.
(viper-mouse-click-search-word): Doc fix.
* lisp/erc/erc-backend.el (erc-forward-word, erc-word-at-arg-p)
(erc-bounds-of-word-at-point): Fix typos.
(erc-decode-string-from-target, define-erc-response-handler):
Refill docstring.
* lisp/erc/erc-dcc.el (pcomplete/erc-mode/DCC): Fix typo.
(erc-dcc-get-host, erc-dcc-auto-mask-p, erc-dcc-get-file):
Doc fixes.
* lisp/erc/erc-networks.el (erc-network-name): Fix typo.
(erc-determine-network): Refill docstring.
* lisp/net/dbus.el (dbus-list-hash-table)
(dbus-string-to-byte-array, dbus-byte-array-to-string)
(dbus-check-event): Fix typos.
(dbus-introspect-get-property): Doc fix.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
Rename ARGS to ARGUMENTS. Doc fix.
(tramp-adb-sh-fix-ls-output, tramp-adb-execute-adb-command)
(tramp-adb-find-test-command): Fix typos.
* lisp/net/tramp.el (tramp-set-completion-function)
(tramp-get-completion-function)
(tramp-completion-dissect-file-name)
(tramp-completion-dissect-file-name1)
(tramp-get-completion-methods, tramp-get-completion-user-host)
(tramp-get-inode, tramp-get-device, tramp-mode-string-to-int)
(tramp-call-process, tramp-call-process-region)
(tramp-process-lines): Fix typos.
(tramp-interrupt-process): Doc fix.
* lisp/org/ob-core.el (org-babel-named-src-block-regexp-for-name)
(org-babel-named-data-regexp-for-name): Doc fix.
(org-babel-src-block-names, org-babel-result-names): Fix typos.
* lisp/progmodes/inf-lisp.el (lisp-input-filter): Doc fix.
(lisp-fn-called-at-pt): Fix typo.
* lisp/progmodes/xref.el (xref-backend-identifier-at-point):
Doc fix.
(xref-backend-identifier-completion-table): Fix typo.
2019-10-20 10:12:27 +00:00
|
|
|
|
"Return a list of statements declaring the values as a generic variable."
|
2017-06-21 11:20:20 +00:00
|
|
|
|
(format "%s=%s" varname (org-babel-sh-var-to-sh values sep hline)))
|
|
|
|
|
|
|
|
|
|
(defun org-babel--variable-assignments:bash_array
|
|
|
|
|
(varname values &optional sep hline)
|
lisp/*.el: Fix typos and improve some docstrings
* lisp/auth-source.el (auth-source-backend-parse-parameters)
(auth-source-search-collection)
(auth-source-secrets-listify-pattern)
(auth-source--decode-octal-string, auth-source-plstore-search):
* lisp/registry.el (registry-lookup)
(registry-lookup-breaks-before-lexbind)
(registry-lookup-secondary, registry-lookup-secondary-value)
(registry-search, registry-delete, registry-size, registry-full)
(registry-insert, registry-reindex, registry-prune)
(registry-collect-prune-candidates):
* lisp/subr.el (nbutlast, process-live-p):
* lisp/tab-bar.el (tab-bar-list):
* lisp/cedet/ede/linux.el (ede-linux--get-archs)
(ede-linux--include-path, ede-linux-load):
* lisp/erc/erc-log.el (erc-log-all-but-server-buffers):
* lisp/erc/erc-pcomplete.el (pcomplete-erc-commands)
(pcomplete-erc-ops, pcomplete-erc-not-ops, pcomplete-erc-nicks)
(pcomplete-erc-all-nicks, pcomplete-erc-channels)
(pcomplete-erc-command-name, pcomplete-erc-parse-arguments):
* lisp/eshell/em-term.el (eshell-visual-command-p):
* lisp/gnus/gnus-cache.el (gnus-cache-fully-p):
* lisp/gnus/nnmail.el (nnmail-get-active)
(nnmail-fancy-expiry-target):
* lisp/mail/mail-utils.el (mail-string-delete):
* lisp/mail/supercite.el (sc-hdr, sc-valid-index-p):
* lisp/net/ange-ftp.el (ange-ftp-use-smart-gateway-p):
* lisp/net/nsm.el (nsm-save-fingerprint-maybe)
(nsm-network-same-subnet, nsm-should-check):
* lisp/net/rcirc.el (rcirc-looking-at-input):
* lisp/net/tramp-cache.el (tramp-get-hash-table):
* lisp/net/tramp-compat.el (tramp-compat-process-running-p):
* lisp/net/tramp-smb.el (tramp-smb-get-share)
(tramp-smb-get-localname, tramp-smb-read-file-entry)
(tramp-smb-get-cifs-capabilities, tramp-smb-get-stat-capability):
* lisp/net/zeroconf.el (zeroconf-list-service-names)
(zeroconf-list-service-types, zeroconf-list-services)
(zeroconf-get-host, zeroconf-get-domain)
(zeroconf-get-host-domain):
* lisp/nxml/rng-xsd.el (rng-xsd-compile)
(rng-xsd-make-date-time-regexp, rng-xsd-convert-date-time):
* lisp/obsolete/erc-hecomplete.el (erc-hecomplete)
(erc-command-list, erc-complete-at-prompt):
* lisp/org/ob-scheme.el (org-babel-scheme-get-buffer-impl):
* lisp/org/ob-shell.el (org-babel--variable-assignments:sh-generic)
(org-babel--variable-assignments:bash_array)
(org-babel--variable-assignments:bash_assoc)
(org-babel--variable-assignments:bash):
* lisp/org/org-clock.el (org-day-of-week):
* lisp/progmodes/cperl-mode.el (cperl-char-ends-sub-keyword-p):
* lisp/progmodes/gud.el (gud-find-c-expr, gud-innermost-expr)
(gud-prev-expr, gud-next-expr):
* lisp/textmodes/table.el (table--at-cell-p, table--probe-cell)
(table--get-cell-justify-property)
(table--get-cell-valign-property)
(table--put-cell-justify-property)
(table--put-cell-valign-property): Fix typos.
* lisp/so-long.el (fboundp): Doc fix.
(so-long-mode-line-info, so-long-mode)
(so-long--check-header-modes): Fix typos.
* lisp/emulation/viper-mous.el (viper-surrounding-word)
(viper-mouse-click-get-word): Fix typos.
(viper-mouse-click-search-word): Doc fix.
* lisp/erc/erc-backend.el (erc-forward-word, erc-word-at-arg-p)
(erc-bounds-of-word-at-point): Fix typos.
(erc-decode-string-from-target, define-erc-response-handler):
Refill docstring.
* lisp/erc/erc-dcc.el (pcomplete/erc-mode/DCC): Fix typo.
(erc-dcc-get-host, erc-dcc-auto-mask-p, erc-dcc-get-file):
Doc fixes.
* lisp/erc/erc-networks.el (erc-network-name): Fix typo.
(erc-determine-network): Refill docstring.
* lisp/net/dbus.el (dbus-list-hash-table)
(dbus-string-to-byte-array, dbus-byte-array-to-string)
(dbus-check-event): Fix typos.
(dbus-introspect-get-property): Doc fix.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
Rename ARGS to ARGUMENTS. Doc fix.
(tramp-adb-sh-fix-ls-output, tramp-adb-execute-adb-command)
(tramp-adb-find-test-command): Fix typos.
* lisp/net/tramp.el (tramp-set-completion-function)
(tramp-get-completion-function)
(tramp-completion-dissect-file-name)
(tramp-completion-dissect-file-name1)
(tramp-get-completion-methods, tramp-get-completion-user-host)
(tramp-get-inode, tramp-get-device, tramp-mode-string-to-int)
(tramp-call-process, tramp-call-process-region)
(tramp-process-lines): Fix typos.
(tramp-interrupt-process): Doc fix.
* lisp/org/ob-core.el (org-babel-named-src-block-regexp-for-name)
(org-babel-named-data-regexp-for-name): Doc fix.
(org-babel-src-block-names, org-babel-result-names): Fix typos.
* lisp/progmodes/inf-lisp.el (lisp-input-filter): Doc fix.
(lisp-fn-called-at-pt): Fix typo.
* lisp/progmodes/xref.el (xref-backend-identifier-at-point):
Doc fix.
(xref-backend-identifier-completion-table): Fix typo.
2019-10-20 10:12:27 +00:00
|
|
|
|
"Return a list of statements declaring the values as a bash array."
|
2017-06-21 11:20:20 +00:00
|
|
|
|
(format "unset %s\ndeclare -a %s=( %s )"
|
|
|
|
|
varname varname
|
|
|
|
|
(mapconcat
|
|
|
|
|
(lambda (value) (org-babel-sh-var-to-sh value sep hline))
|
|
|
|
|
values
|
|
|
|
|
" ")))
|
|
|
|
|
|
|
|
|
|
(defun org-babel--variable-assignments:bash_assoc
|
|
|
|
|
(varname values &optional sep hline)
|
lisp/*.el: Fix typos and improve some docstrings
* lisp/auth-source.el (auth-source-backend-parse-parameters)
(auth-source-search-collection)
(auth-source-secrets-listify-pattern)
(auth-source--decode-octal-string, auth-source-plstore-search):
* lisp/registry.el (registry-lookup)
(registry-lookup-breaks-before-lexbind)
(registry-lookup-secondary, registry-lookup-secondary-value)
(registry-search, registry-delete, registry-size, registry-full)
(registry-insert, registry-reindex, registry-prune)
(registry-collect-prune-candidates):
* lisp/subr.el (nbutlast, process-live-p):
* lisp/tab-bar.el (tab-bar-list):
* lisp/cedet/ede/linux.el (ede-linux--get-archs)
(ede-linux--include-path, ede-linux-load):
* lisp/erc/erc-log.el (erc-log-all-but-server-buffers):
* lisp/erc/erc-pcomplete.el (pcomplete-erc-commands)
(pcomplete-erc-ops, pcomplete-erc-not-ops, pcomplete-erc-nicks)
(pcomplete-erc-all-nicks, pcomplete-erc-channels)
(pcomplete-erc-command-name, pcomplete-erc-parse-arguments):
* lisp/eshell/em-term.el (eshell-visual-command-p):
* lisp/gnus/gnus-cache.el (gnus-cache-fully-p):
* lisp/gnus/nnmail.el (nnmail-get-active)
(nnmail-fancy-expiry-target):
* lisp/mail/mail-utils.el (mail-string-delete):
* lisp/mail/supercite.el (sc-hdr, sc-valid-index-p):
* lisp/net/ange-ftp.el (ange-ftp-use-smart-gateway-p):
* lisp/net/nsm.el (nsm-save-fingerprint-maybe)
(nsm-network-same-subnet, nsm-should-check):
* lisp/net/rcirc.el (rcirc-looking-at-input):
* lisp/net/tramp-cache.el (tramp-get-hash-table):
* lisp/net/tramp-compat.el (tramp-compat-process-running-p):
* lisp/net/tramp-smb.el (tramp-smb-get-share)
(tramp-smb-get-localname, tramp-smb-read-file-entry)
(tramp-smb-get-cifs-capabilities, tramp-smb-get-stat-capability):
* lisp/net/zeroconf.el (zeroconf-list-service-names)
(zeroconf-list-service-types, zeroconf-list-services)
(zeroconf-get-host, zeroconf-get-domain)
(zeroconf-get-host-domain):
* lisp/nxml/rng-xsd.el (rng-xsd-compile)
(rng-xsd-make-date-time-regexp, rng-xsd-convert-date-time):
* lisp/obsolete/erc-hecomplete.el (erc-hecomplete)
(erc-command-list, erc-complete-at-prompt):
* lisp/org/ob-scheme.el (org-babel-scheme-get-buffer-impl):
* lisp/org/ob-shell.el (org-babel--variable-assignments:sh-generic)
(org-babel--variable-assignments:bash_array)
(org-babel--variable-assignments:bash_assoc)
(org-babel--variable-assignments:bash):
* lisp/org/org-clock.el (org-day-of-week):
* lisp/progmodes/cperl-mode.el (cperl-char-ends-sub-keyword-p):
* lisp/progmodes/gud.el (gud-find-c-expr, gud-innermost-expr)
(gud-prev-expr, gud-next-expr):
* lisp/textmodes/table.el (table--at-cell-p, table--probe-cell)
(table--get-cell-justify-property)
(table--get-cell-valign-property)
(table--put-cell-justify-property)
(table--put-cell-valign-property): Fix typos.
* lisp/so-long.el (fboundp): Doc fix.
(so-long-mode-line-info, so-long-mode)
(so-long--check-header-modes): Fix typos.
* lisp/emulation/viper-mous.el (viper-surrounding-word)
(viper-mouse-click-get-word): Fix typos.
(viper-mouse-click-search-word): Doc fix.
* lisp/erc/erc-backend.el (erc-forward-word, erc-word-at-arg-p)
(erc-bounds-of-word-at-point): Fix typos.
(erc-decode-string-from-target, define-erc-response-handler):
Refill docstring.
* lisp/erc/erc-dcc.el (pcomplete/erc-mode/DCC): Fix typo.
(erc-dcc-get-host, erc-dcc-auto-mask-p, erc-dcc-get-file):
Doc fixes.
* lisp/erc/erc-networks.el (erc-network-name): Fix typo.
(erc-determine-network): Refill docstring.
* lisp/net/dbus.el (dbus-list-hash-table)
(dbus-string-to-byte-array, dbus-byte-array-to-string)
(dbus-check-event): Fix typos.
(dbus-introspect-get-property): Doc fix.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
Rename ARGS to ARGUMENTS. Doc fix.
(tramp-adb-sh-fix-ls-output, tramp-adb-execute-adb-command)
(tramp-adb-find-test-command): Fix typos.
* lisp/net/tramp.el (tramp-set-completion-function)
(tramp-get-completion-function)
(tramp-completion-dissect-file-name)
(tramp-completion-dissect-file-name1)
(tramp-get-completion-methods, tramp-get-completion-user-host)
(tramp-get-inode, tramp-get-device, tramp-mode-string-to-int)
(tramp-call-process, tramp-call-process-region)
(tramp-process-lines): Fix typos.
(tramp-interrupt-process): Doc fix.
* lisp/org/ob-core.el (org-babel-named-src-block-regexp-for-name)
(org-babel-named-data-regexp-for-name): Doc fix.
(org-babel-src-block-names, org-babel-result-names): Fix typos.
* lisp/progmodes/inf-lisp.el (lisp-input-filter): Doc fix.
(lisp-fn-called-at-pt): Fix typo.
* lisp/progmodes/xref.el (xref-backend-identifier-at-point):
Doc fix.
(xref-backend-identifier-completion-table): Fix typo.
2019-10-20 10:12:27 +00:00
|
|
|
|
"Return a list of statements declaring the values as bash associative array."
|
2017-06-21 11:20:20 +00:00
|
|
|
|
(format "unset %s\ndeclare -A %s\n%s"
|
|
|
|
|
varname varname
|
|
|
|
|
(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")))
|
|
|
|
|
|
|
|
|
|
(defun org-babel--variable-assignments:bash (varname values &optional sep hline)
|
lisp/*.el: Fix typos and improve some docstrings
* lisp/auth-source.el (auth-source-backend-parse-parameters)
(auth-source-search-collection)
(auth-source-secrets-listify-pattern)
(auth-source--decode-octal-string, auth-source-plstore-search):
* lisp/registry.el (registry-lookup)
(registry-lookup-breaks-before-lexbind)
(registry-lookup-secondary, registry-lookup-secondary-value)
(registry-search, registry-delete, registry-size, registry-full)
(registry-insert, registry-reindex, registry-prune)
(registry-collect-prune-candidates):
* lisp/subr.el (nbutlast, process-live-p):
* lisp/tab-bar.el (tab-bar-list):
* lisp/cedet/ede/linux.el (ede-linux--get-archs)
(ede-linux--include-path, ede-linux-load):
* lisp/erc/erc-log.el (erc-log-all-but-server-buffers):
* lisp/erc/erc-pcomplete.el (pcomplete-erc-commands)
(pcomplete-erc-ops, pcomplete-erc-not-ops, pcomplete-erc-nicks)
(pcomplete-erc-all-nicks, pcomplete-erc-channels)
(pcomplete-erc-command-name, pcomplete-erc-parse-arguments):
* lisp/eshell/em-term.el (eshell-visual-command-p):
* lisp/gnus/gnus-cache.el (gnus-cache-fully-p):
* lisp/gnus/nnmail.el (nnmail-get-active)
(nnmail-fancy-expiry-target):
* lisp/mail/mail-utils.el (mail-string-delete):
* lisp/mail/supercite.el (sc-hdr, sc-valid-index-p):
* lisp/net/ange-ftp.el (ange-ftp-use-smart-gateway-p):
* lisp/net/nsm.el (nsm-save-fingerprint-maybe)
(nsm-network-same-subnet, nsm-should-check):
* lisp/net/rcirc.el (rcirc-looking-at-input):
* lisp/net/tramp-cache.el (tramp-get-hash-table):
* lisp/net/tramp-compat.el (tramp-compat-process-running-p):
* lisp/net/tramp-smb.el (tramp-smb-get-share)
(tramp-smb-get-localname, tramp-smb-read-file-entry)
(tramp-smb-get-cifs-capabilities, tramp-smb-get-stat-capability):
* lisp/net/zeroconf.el (zeroconf-list-service-names)
(zeroconf-list-service-types, zeroconf-list-services)
(zeroconf-get-host, zeroconf-get-domain)
(zeroconf-get-host-domain):
* lisp/nxml/rng-xsd.el (rng-xsd-compile)
(rng-xsd-make-date-time-regexp, rng-xsd-convert-date-time):
* lisp/obsolete/erc-hecomplete.el (erc-hecomplete)
(erc-command-list, erc-complete-at-prompt):
* lisp/org/ob-scheme.el (org-babel-scheme-get-buffer-impl):
* lisp/org/ob-shell.el (org-babel--variable-assignments:sh-generic)
(org-babel--variable-assignments:bash_array)
(org-babel--variable-assignments:bash_assoc)
(org-babel--variable-assignments:bash):
* lisp/org/org-clock.el (org-day-of-week):
* lisp/progmodes/cperl-mode.el (cperl-char-ends-sub-keyword-p):
* lisp/progmodes/gud.el (gud-find-c-expr, gud-innermost-expr)
(gud-prev-expr, gud-next-expr):
* lisp/textmodes/table.el (table--at-cell-p, table--probe-cell)
(table--get-cell-justify-property)
(table--get-cell-valign-property)
(table--put-cell-justify-property)
(table--put-cell-valign-property): Fix typos.
* lisp/so-long.el (fboundp): Doc fix.
(so-long-mode-line-info, so-long-mode)
(so-long--check-header-modes): Fix typos.
* lisp/emulation/viper-mous.el (viper-surrounding-word)
(viper-mouse-click-get-word): Fix typos.
(viper-mouse-click-search-word): Doc fix.
* lisp/erc/erc-backend.el (erc-forward-word, erc-word-at-arg-p)
(erc-bounds-of-word-at-point): Fix typos.
(erc-decode-string-from-target, define-erc-response-handler):
Refill docstring.
* lisp/erc/erc-dcc.el (pcomplete/erc-mode/DCC): Fix typo.
(erc-dcc-get-host, erc-dcc-auto-mask-p, erc-dcc-get-file):
Doc fixes.
* lisp/erc/erc-networks.el (erc-network-name): Fix typo.
(erc-determine-network): Refill docstring.
* lisp/net/dbus.el (dbus-list-hash-table)
(dbus-string-to-byte-array, dbus-byte-array-to-string)
(dbus-check-event): Fix typos.
(dbus-introspect-get-property): Doc fix.
* lisp/net/tramp-adb.el (tramp-adb-file-name-handler):
Rename ARGS to ARGUMENTS. Doc fix.
(tramp-adb-sh-fix-ls-output, tramp-adb-execute-adb-command)
(tramp-adb-find-test-command): Fix typos.
* lisp/net/tramp.el (tramp-set-completion-function)
(tramp-get-completion-function)
(tramp-completion-dissect-file-name)
(tramp-completion-dissect-file-name1)
(tramp-get-completion-methods, tramp-get-completion-user-host)
(tramp-get-inode, tramp-get-device, tramp-mode-string-to-int)
(tramp-call-process, tramp-call-process-region)
(tramp-process-lines): Fix typos.
(tramp-interrupt-process): Doc fix.
* lisp/org/ob-core.el (org-babel-named-src-block-regexp-for-name)
(org-babel-named-data-regexp-for-name): Doc fix.
(org-babel-src-block-names, org-babel-result-names): Fix typos.
* lisp/progmodes/inf-lisp.el (lisp-input-filter): Doc fix.
(lisp-fn-called-at-pt): Fix typo.
* lisp/progmodes/xref.el (xref-backend-identifier-at-point):
Doc fix.
(xref-backend-identifier-completion-table): Fix typo.
2019-10-20 10:12:27 +00:00
|
|
|
|
"Represent the parameters as useful Bash shell variables."
|
2017-06-21 11:20:20 +00:00
|
|
|
|
(pcase values
|
|
|
|
|
(`((,_ ,_ . ,_) . ,_) ;two-dimensional array
|
|
|
|
|
(org-babel--variable-assignments:bash_assoc varname values sep hline))
|
|
|
|
|
(`(,_ . ,_) ;simple list
|
|
|
|
|
(org-babel--variable-assignments:bash_array varname values sep hline))
|
|
|
|
|
(_ ;scalar value
|
|
|
|
|
(org-babel--variable-assignments:sh-generic varname values sep hline))))
|
|
|
|
|
|
|
|
|
|
(defun org-babel-variable-assignments:shell (params)
|
|
|
|
|
"Return list of shell statements assigning the block's variables."
|
|
|
|
|
(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-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)))
|
|
|
|
|
(org-babel--get-vars params))))
|
|
|
|
|
|
|
|
|
|
(defun org-babel-sh-var-to-sh (var &optional sep hline)
|
|
|
|
|
"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."
|
|
|
|
|
(concat "'" (replace-regexp-in-string
|
|
|
|
|
"'" "'\"'\"'"
|
|
|
|
|
(org-babel-sh-var-to-string var sep hline))
|
|
|
|
|
"'"))
|
|
|
|
|
|
|
|
|
|
(defun org-babel-sh-var-to-string (var &optional sep hline)
|
|
|
|
|
"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)) (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)
|
|
|
|
|
"Initiate a session named SESSION according to PARAMS."
|
|
|
|
|
(when (and session (not (string= session "none")))
|
|
|
|
|
(save-window-excursion
|
|
|
|
|
(or (org-babel-comint-buffer-livep session)
|
|
|
|
|
(progn
|
|
|
|
|
(shell session)
|
|
|
|
|
;; 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))
|
|
|
|
|
(get-buffer (current-buffer)))))))
|
|
|
|
|
|
|
|
|
|
(defvar org-babel-sh-eoe-indicator "echo 'org_babel_sh_eoe'"
|
|
|
|
|
"String to indicate that evaluation has completed.")
|
|
|
|
|
(defvar org-babel-sh-eoe-output "org_babel_sh_eoe"
|
|
|
|
|
"String to indicate that evaluation has completed.")
|
|
|
|
|
|
|
|
|
|
(defun org-babel-sh-evaluate (session body &optional params stdin cmdline)
|
|
|
|
|
"Pass BODY to the Shell process in BUFFER.
|
|
|
|
|
If RESULT-TYPE equals `output' then return a list of the outputs
|
|
|
|
|
of the statements in BODY, if RESULT-TYPE equals `value' then
|
|
|
|
|
return the value of the last statement in BODY."
|
|
|
|
|
(let ((results
|
|
|
|
|
(cond
|
|
|
|
|
((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 (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"))
|
|
|
|
|
(insert body))
|
|
|
|
|
(set-file-modes script-file #o755)
|
|
|
|
|
(with-temp-file stdin-file (insert (or stdin "")))
|
|
|
|
|
(with-temp-buffer
|
|
|
|
|
(call-process-shell-command
|
|
|
|
|
(concat (if shebang script-file
|
|
|
|
|
(format "%s %s" shell-file-name script-file))
|
|
|
|
|
(and cmdline (concat " " cmdline)))
|
|
|
|
|
stdin-file
|
|
|
|
|
(current-buffer))
|
|
|
|
|
(buffer-string))))
|
|
|
|
|
(session ; session evaluation
|
|
|
|
|
(mapconcat
|
|
|
|
|
#'org-babel-sh-strip-weird-long-prompt
|
|
|
|
|
(mapcar
|
|
|
|
|
#'org-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-trim body) "\n")
|
|
|
|
|
(list org-babel-sh-eoe-indicator))))
|
|
|
|
|
2)) "\n"))
|
|
|
|
|
('otherwise ; external shell script
|
|
|
|
|
(if (and (cdr (assq :shebang params))
|
|
|
|
|
(> (length (cdr (assq :shebang params))) 0))
|
|
|
|
|
(let ((script-file (org-babel-temp-file "sh-script-"))
|
|
|
|
|
(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-trim body)))))))
|
|
|
|
|
(when results
|
|
|
|
|
(let ((result-params (cdr (assq :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)))))))
|
|
|
|
|
|
|
|
|
|
(defun org-babel-sh-strip-weird-long-prompt (string)
|
|
|
|
|
"Remove prompt cruft from a string of shell output."
|
|
|
|
|
(while (string-match "^% +[\r\n$]+ *" string)
|
|
|
|
|
(setq string (substring string (match-end 0))))
|
|
|
|
|
string)
|
|
|
|
|
|
|
|
|
|
(provide 'ob-shell)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
;;; ob-shell.el ends here
|