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

Fix #3727: 'doom: command not found' error on 'doom upgrade'

Browse source
This commit is contained in:
Henrik Lissner 2020-08-11 14:26:49 -04:00
parent 64dfc709bf
commit d9739a2d10
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
2 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
bin/doom
View file

@ -7,7 +7,7 @@
:; _DOOMPOST="$_DOOMBASE/.local/.doom.sh" :; _DOOMPOST="$_DOOMBASE/.local/.doom.sh"
:; $EMACS --no-site-file --script "$0" -- "$@" :; $EMACS --no-site-file --script "$0" -- "$@"
:; CODE=$? :; CODE=$?
:; [ -x "$_DOOMPOST" ] && PATH="$_DOOMBASE/bin:$PATH" "$_DOOMPOST" "$0" "$@" :; [ -x "$_DOOMPOST" ] && "$_DOOMPOST" "$0" "$@"
:; exit $CODE :; exit $CODE
;; CLI ops tend to eat a lot of memory. To speed it up, stave off the GC, but ;; CLI ops tend to eat a lot of memory. To speed it up, stave off the GC, but

5
core/core-cli.el
View file

@ -177,10 +177,11 @@ COMMAND, and passes ARGS to it."
(insert "#!/usr/bin/env sh\n" (insert "#!/usr/bin/env sh\n"
(save-match-data (save-match-data
(cl-loop for env in process-environment (cl-loop for env in process-environment
if (string-match "^\\([^ !@#$%^&*()=]+\\)=\\(.+\\)$" env) if (string-match "^\\([a-zA-Z0-9_]+\\)=\\(.+\\)$" env)
concat (format "%s=%S\n" concat (format "export %s=%S\n"
(match-string 1 env) (match-string 1 env)
(match-string 2 env)))) (match-string 2 env))))
(format "\nexport PATH=\"%s:$PATH\"\n" (concat doom-emacs-dir "bin/"))
"\n[ -x \"$0\" ] && rm -f \"$0\"\n" "\n[ -x \"$0\" ] && rm -f \"$0\"\n"
(if (stringp lines) (if (stringp lines)
lines lines