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

Add deprecation warnings to doom patch-macos

Browse source 
And make "doom env enable" an alias for "doom env auto"
This commit is contained in:
Henrik Lissner 2019-05-09 18:43:32 -04:00
parent ed562212eb
commit d7bc99c3c3
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
core/cli/env.el
View file

@ -5,7 +5,7 @@
(pcase (car args) (pcase (car args)
((or "refresh" "re") ((or "refresh" "re")
(doom-reload-env-file 'force)) (doom-reload-env-file 'force))
("enable" ((or "enable" "auto")
(setenv "DOOMENV" "1") (setenv "DOOMENV" "1")
(print! (green "Enabling auto-reload of %S") env-file) (print! (green "Enabling auto-reload of %S") env-file)
(doom-reload-env-file 'force) (doom-reload-env-file 'force)
@ -17,7 +17,9 @@
(delete-file env-file) (delete-file env-file)
(print! (green "Disabled envvar file by deleting %S") env-file)) (print! (green "Disabled envvar file by deleting %S") env-file))
(_ (_
(message "No valid subcommand provided. See `doom help env`.")))) (print! "%s\n\n%s"
(bold (red "No valid subcommand provided."))
"See `doom help env` to see available commands."))))
"Manages your envvars file. "Manages your envvars file.
env [SUBCOMMAND] env [SUBCOMMAND]
@ -25,7 +27,7 @@
Available subcommands: Available subcommands:
refresh Create or regenerate your envvar file refresh Create or regenerate your envvar file
enable enable auto-reloading of your envvars file (on `doom refresh`) auto enable auto-reloading of your envvars file (on `doom refresh`)
clear deletes your envvar file (if it exists) and disables auto-reloading clear deletes your envvar file (if it exists) and disables auto-reloading
An envvars file (its location is controlled by the `doom-env-file' variable) An envvars file (its location is controlled by the `doom-env-file' variable)

5
core/cli/patch-macos.el
View file

@ -6,6 +6,8 @@
(doom--find-emacsapp-path)) (doom--find-emacsapp-path))
"Patches Emacs.app to respect your shell environment. "Patches Emacs.app to respect your shell environment.
WARNING: This command is deprecated. Use 'doom env' instead.
A common issue with GUI Emacs on MacOS is that it launches in an environment A common issue with GUI Emacs on MacOS is that it launches in an environment
independent of your shell configuration, including your PATH and any other independent of your shell configuration, including your PATH and any other
utilities like rbenv, rvm or virtualenv. utilities like rbenv, rvm or virtualenv.
@ -67,7 +69,8 @@ depending on your shell configuration and isn't always reliable.")
((or doom-auto-accept ((or doom-auto-accept
(y-or-n-p (y-or-n-p
(concat "Doom would like to patch your Emacs.app bundle so that it respects\n" (concat "(WARNING: patch-macos is deprecated, use `doom env refresh` instead)\n\n"
"Doom would like to patch your Emacs.app bundle so that it respects\n"
"your shell configuration. For more information on why and how, run\n\n" "your shell configuration. For more information on why and how, run\n\n"
" bin/doom help patch-macos\n\n" " bin/doom help patch-macos\n\n"
"Patch Emacs.app?"))) "Patch Emacs.app?")))