From bd476a1f43be47fe79db76e7fea36c750549f72b Mon Sep 17 00:00:00 2001 From: Tino Calancha Date: Wed, 6 Apr 2016 00:36:17 +0900 Subject: [PATCH 1/2] Wait until all parallel shell commands finish * lisp/dired-aux.el (dired-shell-stuff-it): Force POSIX shells to wait until all background jobs finish. (Bug#23206). --- lisp/dired-aux.el | 31 ++++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el index d29abf3..cc6f168 100644 --- a/lisp/dired-aux.el +++ b/lisp/dired-aux.el @@ -729,6 +729,7 @@ dired-shell-stuff-it (command (if sequentially (substring command 0 (match-beginning 0)) command)) + (parallel-in-background (and in-background (not sequentially))) (stuff-it (if (or (string-match-p dired-star-subst-regexp command) (string-match-p dired-quark-subst-regexp command)) @@ -740,15 +741,27 @@ dired-shell-stuff-it retval)) (lambda (x) (concat command dired-mark-separator x))))) (concat - (if on-each - (mapconcat stuff-it (mapcar 'shell-quote-argument file-list) - (if (and in-background (not sequentially)) "&" ";")) - (let ((files (mapconcat 'shell-quote-argument - file-list dired-mark-separator))) - (if (> (length file-list) 1) - (setq files (concat dired-mark-prefix files dired-mark-postfix))) - (funcall stuff-it files))) - (if in-background "&" "")))) + (cond (on-each + (format "%s%s" + (mapconcat stuff-it (mapcar 'shell-quote-argument file-list) + (or (and parallel-in-background "&") ";")) + ;; POSIX shells running a list of commands in the background + ;; (LIST = cmd_1 & [cmd_2 & ... cmd_i & ... cmd_N &]) + ;; return once cmd_N ends, i.e., the shell does not + ;; wait for cmd_i to finish before executing cmd_i+1. + ;; That means, running (shell-command LIST) may not show + ;; the output of all the commands (Bug#23206). + ;; Add 'wait' to force those POSIX shells to wait until + ;; all commands finish. + (or (and parallel-in-background (not (memq system-type '(ms-dos windows-nt))) "&wait") + ""))) + (t + (let ((files (mapconcat 'shell-quote-argument + file-list dired-mark-separator))) + (when (cdr file-list) + (setq files (concat dired-mark-prefix files dired-mark-postfix))) + (funcall stuff-it files)))) + (or (and in-background "&") "")))) ;; This is an extra function so that it can be redefined by ange-ftp. ;;;###autoload -- 2.8.0.rc3