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

Display absolute paths in 'doom env' output

Browse source 
To make it clearer where the envvar file is saved to.
This commit is contained in:
Henrik Lissner 2019-09-09 13:44:12 -04:00
parent 23509d22c5
commit 51e950cc5c
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
core/cli/env.el
View file

@ -25,17 +25,16 @@ Use the -c or --clear switch to delete your envvar file."
(when (member "clear" args) ; DEPRECATED (when (member "clear" args) ; DEPRECATED
(message "'doom env clear' is deprecated. Use 'doom env -c' or 'doom env --clear' instead") (message "'doom env clear' is deprecated. Use 'doom env -c' or 'doom env --clear' instead")
(push "-c" args)) (push "-c" args))
(let ((env-file (or (cadr (member "-o" args)) (let ((env-file (or (cadr (member "-o" args))
doom-env-file))) doom-env-file)))
(cond ((or (member "-c" args) (cond ((or (member "-c" args)
(member "--clear" args)) (member "--clear" args))
(unless (file-exists-p env-file) (unless (file-exists-p env-file)
(user-error! "%S does not exist to be cleared" (user-error! "%S does not exist to be cleared"
(relpath env-file))) (path env-file)))
(delete-file env-file) (delete-file env-file)
(print! (success "Successfully deleted %S") (print! (success "Successfully deleted %S")
(relpath env-file))) (path env-file)))
((or (null args) ((or (null args)
(member "-o" args)) (member "-o" args))
@ -97,7 +96,7 @@ default, on Linux, this is '$SHELL -ic /usr/bin/env'. Variables in
(if (file-exists-p env-file) (if (file-exists-p env-file)
"Regenerating" "Regenerating"
"Generating") "Generating")
(relpath env-file doom-emacs-dir)) (path env-file))
(let ((process-environment doom--initial-process-environment)) (let ((process-environment doom--initial-process-environment))
(let ((shell-command-switch doom-env-switches) (let ((shell-command-switch doom-env-switches)
(error-buffer (get-buffer-create "*env errors*"))) (error-buffer (get-buffer-create "*env errors*")))
@ -142,5 +141,5 @@ default, on Linux, this is '$SHELL -ic /usr/bin/env'. Variables in
(print! (info "Ignoring %s") var) (print! (info "Ignoring %s") var)
(delete-region (match-beginning 0) (1- valend))))))) (delete-region (match-beginning 0) (1- valend)))))))
(print! (success "Successfully generated %S") (print! (success "Successfully generated %S")
(relpath env-file doom-emacs-dir)) (path env-file))
t)))))) t))))))