github/melpa
1
0
Fork 0
mirror of https://github.com/correl/melpa.git synced 2024-12-22 19:17:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

More carefully detect the presence of GNU coreutils "timeout" command

Browse source 
See https://github.com/cask/cask/issues/220
This commit is contained in:
Steve Purcell 2014-06-09 18:32:36 +01:00
parent d384f185f7
commit ab8f52dde9
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
package-build.el
View file

@ -70,6 +70,14 @@
(defvar package-build-stable nil
"When non-nil, `package-build' tries to build packages from versions-tagged code.")
(defvar package-build-timeout-executable
(let ((prog (or (executable-find "timeout")
(executable-find "gtimeout"))))
(when (and prog
(string-match-p "^ *-k" (shell-command-to-string (concat prog " --help"))))
prog))
"Path to a GNU coreutils \"timeout\" command if available.")
;;; Internal Variables
(defvar pb/recipe-alist nil
@ -169,9 +177,8 @@ The return list is of the form ((FULL GROUP) ...) where FULL is the complete reg
"In DIR (or `default-directory' if unset) run COMMAND with ARGS.
Output is written to the current buffer."
(let* ((default-directory (file-name-as-directory (or dir default-directory)))
(have-timeout (executable-find "timeout"))
(argv (if have-timeout
(append (list "timeout" "-k" "60" "600" command) args)
(argv (if package-build-timeout-executable
(append (list package-build-timeout-executable "-k" "60" "600" command) args)
(cons command args))))
(unless (file-directory-p default-directory)
(error "Can't run process in non-existent directory: %s" default-directory))