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

Ensure doom-packages is initialized in doom-initialize

Browse source
This commit is contained in:
Henrik Lissner 2018-03-26 03:06:06 -04:00
parent f1c0d70e34
commit 72eb1422c5
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
core/core-packages.el
View file

@ -151,6 +151,8 @@ FORCE-P is non-nil, do it anyway.
(unless (load doom-autoload-file t t t) (unless (load doom-autoload-file t t t)
(unless noninteractive (unless noninteractive
(error "No autoloads file! Run make autoloads"))) (error "No autoloads file! Run make autoloads")))
(when noninteractive
(delete-file doom-packages-file))
(when (or force-p (not (load doom-packages-file t t t))) (when (or force-p (not (load doom-packages-file t t t)))
;; Ensure core folders exist, otherwise we get errors ;; Ensure core folders exist, otherwise we get errors
(dolist (dir (list doom-local-dir doom-etc-dir doom-cache-dir doom-packages-dir)) (dolist (dir (list doom-local-dir doom-etc-dir doom-cache-dir doom-packages-dir))
@ -178,9 +180,9 @@ FORCE-P is non-nil, do it anyway.
(error "✕ Couldn't install %s" package))) (error "✕ Couldn't install %s" package)))
(message "Installing core packages...done"))) (message "Installing core packages...done")))
(cl-pushnew doom-core-dir load-path :test #'string=) (cl-pushnew doom-core-dir load-path :test #'string=)
(doom-initialize-packages 'internal)
(unless noninteractive (unless noninteractive
(with-temp-buffer (with-temp-buffer
(doom-initialize-packages 'internal)
(prin1 `(setq load-path ',load-path (prin1 `(setq load-path ',load-path
Info-directory-list ',Info-directory-list Info-directory-list ',Info-directory-list
doom-disabled-packages ',doom-disabled-packages) doom-disabled-packages ',doom-disabled-packages)