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

refactor(cli): include envvars in _doomrun debug logs

Browse source
This commit is contained in:
Henrik Lissner 2022-08-06 14:21:23 +02:00
parent 725de1ca35
commit 0ed2b95dba
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
lisp/doom-cli-lib.el
View file

@ -1102,21 +1102,22 @@ Emacs' batch library lacks an implementation of the exec system call."
(setenv "__DOOMCONTEXT" context-file) (setenv "__DOOMCONTEXT" context-file)
(make-directory (file-name-directory script-file) t) (make-directory (file-name-directory script-file) t)
(let ((coding-system-for-write 'utf-8-auto) (let ((coding-system-for-write 'utf-8-auto)
(persistent-files (combine-and-quote-strings (delq nil (list script-file context-file))))) (persistent-files (combine-and-quote-strings (delq nil (list script-file context-file))))
(env (save-match-data
(cl-loop with initial-env = (get 'process-environment 'initial-value)
for env in (seq-difference process-environment initial-env)
if (string-match "^\\([a-zA-Z0-9_][^=]+\\)=\\(.+\\)$" env)
collect (format "%s=%s"
(match-string 1 env)
(shell-quote-argument (match-string 2 env)))))))
(with-temp-file script-file (with-temp-file script-file
(doom-log "_doomrun: %s" command) (doom-log "_doomrun: %s %s" (string-join env " ") command)
(doom-log "_doomcleanup: %s" persistent-files) (doom-log "_doomcleanup: %s" persistent-files)
(insert "#!/usr/bin/env sh\n" (insert "#!/usr/bin/env sh\n"
"trap _doomcleanup EXIT\n" "trap _doomcleanup EXIT\n"
"_doomcleanup() {\n rm -f " persistent-files "\n}\n" "_doomcleanup() {\n rm -f " persistent-files "\n}\n"
"_doomrun() {\n " command "\n}\n" "_doomrun() {\n " command "\n}\n"
(save-match-data (string-join env " \\\n")
(cl-loop with initial-env = (get 'process-environment 'initial-value)
for env in (seq-difference process-environment initial-env)
if (string-match "^\\([a-zA-Z0-9_]+\\|__DOOM[^=]+\\)=\\(.+\\)$" env)
concat (format "%s=%s \\\n"
(match-string 1 env)
(shell-quote-argument (match-string 2 env)))))
(format "PATH=\"%s%s$PATH\" \\\n" (format "PATH=\"%s%s$PATH\" \\\n"
(doom-path doom-emacs-dir "bin") (doom-path doom-emacs-dir "bin")
path-separator) path-separator)