emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix #3781 (part 2): error reading from stdin

Browse source 
Possibly addresses #3746
This commit is contained in:
Henrik Lissner 2020-08-19 13:56:11 -04:00
parent bb1e2247dd
commit 8402f8aecc
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
core/core-cli.el
View file

@ -171,19 +171,11 @@ COMMAND, and passes ARGS to it."
(defun doom-cli--execute-after (lines) (defun doom-cli--execute-after (lines)
(let ((post-script (concat doom-local-dir ".doom.sh")) (let ((post-script (concat doom-local-dir ".doom.sh"))
(coding-system-for-write 'utf-8) (coding-system-for-write 'utf-8-unix)
(coding-system-for-read 'utf-8) (coding-system-for-read 'utf-8-unix))
(delimiter "__EOF__"))
(with-temp-file post-script (with-temp-file post-script
(insert "#!/usr/bin/env sh\n" (insert "#!/usr/bin/env sh\n"
(save-match-data "_postscript() {\n"
(cl-loop for env in process-environment
if (string-match "^\\([a-zA-Z0-9_]+\\)=\\(.+\\)$" env)
concat (format "%s=%s \\\n"
(match-string 1 env)
(shell-quote-argument (match-string 2 env)))))
(format "PATH=\"%s:$PATH\" \\\n" (concat doom-emacs-dir "bin/"))
"/usr/bin/env sh <<" delimiter "\n"
"rm -f " (shell-quote-argument post-script) "\n" "rm -f " (shell-quote-argument post-script) "\n"
(if (stringp lines) (if (stringp lines)
lines lines
@ -193,7 +185,15 @@ COMMAND, and passes ARGS to it."
collect (mapconcat #'shell-quote-argument (remq nil line) " ")) collect (mapconcat #'shell-quote-argument (remq nil line) " "))
(list (mapconcat #'shell-quote-argument (remq nil lines) " "))) (list (mapconcat #'shell-quote-argument (remq nil lines) " ")))
"\n")) "\n"))
"\n" delimiter "\n")) "\n}\n"
(save-match-data
(cl-loop for env in process-environment
if (string-match "^\\([a-zA-Z0-9_]+\\)=\\(.+\\)$" env)
concat (format "%s=%s \\\n"
(match-string 1 env)
(shell-quote-argument (match-string 2 env)))))
(format "PATH=\"%s:$PATH\" \\\n" (concat doom-emacs-dir "bin/"))
"_postscript $@\n"))
(set-file-modes post-script #o700))) (set-file-modes post-script #o700)))
(defun doom-cli-execute-lines-after (&rest lines) (defun doom-cli-execute-lines-after (&rest lines)