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

Improve doom patch-macos documentation

Browse source 
Makes doom help patch-macos more informative, and simplifies
confirmation prompt when using it.
This commit is contained in:
Henrik Lissner 2018-08-23 16:21:21 +02:00
parent 1890356d11
commit fa81f7ed71
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 23 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

36
core/core-cli.el
View file

@ -193,16 +193,29 @@ recompile. Run this whenever you:
(dispatcher! (patch-macos) (doom-patch-macos args) (dispatcher! (patch-macos) (doom-patch-macos args)
"Patches Emacs.app to respect your shell environment. "Patches Emacs.app to respect your shell environment.
This searches for Emacs.app in /Applications and ~/Applications, then moves A common issue with GUI Emacs on MacOS is that it launches in an environment
Contents/MacOS/Emacs to Contents/MacOS/RunEmacs, and replaces the former with independent of your shell configuration, including your PATH and any other
the following wrapper script: utilities like rbenv, rvm or virtualenv.
#!/usr/bin/env bash This patch fixes this by patching Emacs.app (in /Applications or
args=\"$@\" ~/Applications). It will:
pwd=\"$(cd \"$(dirname \"${BASH_SOURCE[0]}\")\"; pwd -P)\"
exec \"$SHELL\" -c \"$pwd/RunEmacs $args\"
This ensures that Emacs is always aware of your shell environment.") 1. Move Contents/MacOS/Emacs to Contents/MacOS/RunEmacs
2. And replace Contents/MacOS/Emacs with the following wrapper script:
#!/usr/bin/env bash
args=\"$@\"
pwd=\"$(cd \"$(dirname \"${BASH_SOURCE[0]}\")\"; pwd -P)\"
exec \"$SHELL\" -c \"$pwd/RunEmacs $args\"
This ensures that Emacs is always aware of your shell environment, regardless of
how it is launched.
It can be undone with the --undo or -u options.
Alternatively, you can install the exec-path-from-shell Emacs plugin, which will
scrape your shell environment remotely, at startup. However, this can be slow
depending on your shell configuration and isn't always reliable.")
;; ;;
@ -352,11 +365,8 @@ packages and regenerates the autoloads file."
(user-error "%s is already patched" appdir)) (user-error "%s is already patched" appdir))
((or doom-auto-accept ((or doom-auto-accept
(progn (y-or-n-p (concat "/Applications/Emacs.app needs to be patched. See `bin/doom help patch-macos' for why and how.\n\n"
(print! "/Applications/Emacs.app needs to be patched.") "Patch Emacs.app?")))
(print! "\nWhy? So that Emacs will respect your shell configuration when not launched from the shell.")
(print! "\nHow? By replacing Emacs.app/Contents/MacOS/Emacs with a wrapper that launches Emacs from your shell.")
(y-or-n-p "Patch Emacs.app?")))
(copy-file oldbin newbin nil nil nil 'preserve-permissions) (copy-file oldbin newbin nil nil nil 'preserve-permissions)
(unless (file-exists-p newbin) (unless (file-exists-p newbin)
(error "Failed to copy %s to %s" oldbin newbin)) (error "Failed to copy %s to %s" oldbin newbin))