From 51e950cc5c38b511d8fd11597f18c6fae57d73e8 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 9 Sep 2019 13:44:12 -0400 Subject: [PATCH] Display absolute paths in 'doom env' output To make it clearer where the envvar file is saved to. --- core/cli/env.el | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/core/cli/env.el b/core/cli/env.el index 04276e0aa..0ffd53adf 100644 --- a/core/cli/env.el +++ b/core/cli/env.el @@ -25,17 +25,16 @@ Use the -c or --clear switch to delete your envvar file." (when (member "clear" args) ; DEPRECATED (message "'doom env clear' is deprecated. Use 'doom env -c' or 'doom env --clear' instead") (push "-c" args)) - (let ((env-file (or (cadr (member "-o" args)) doom-env-file))) (cond ((or (member "-c" args) (member "--clear" args)) (unless (file-exists-p env-file) (user-error! "%S does not exist to be cleared" - (relpath env-file))) + (path env-file))) (delete-file env-file) (print! (success "Successfully deleted %S") - (relpath env-file))) + (path env-file))) ((or (null 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) "Regenerating" "Generating") - (relpath env-file doom-emacs-dir)) + (path env-file)) (let ((process-environment doom--initial-process-environment)) (let ((shell-command-switch doom-env-switches) (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) (delete-region (match-beginning 0) (1- valend))))))) (print! (success "Successfully generated %S") - (relpath env-file doom-emacs-dir)) + (path env-file)) t))))))