From eb1296387f145c7ccdfbf9c3e01b086e7908a332 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 28 Mar 2019 13:15:08 -0400 Subject: [PATCH] Make load-env-vars a core package Fixes a race condition where the load-env-vars package is used before it was (or could be) installed. --- core/core-packages.el | 3 ++- core/core.el | 9 +++++---- core/packages.el | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/core-packages.el b/core/core-packages.el index eac7f293a..de4376e88 100644 --- a/core/core-packages.el +++ b/core/core-packages.el @@ -41,7 +41,8 @@ package's name as a symbol, and whose CDR is the plist supplied to its `package!' declaration. Set by `doom-initialize-packages'.") -(defvar doom-core-packages '(persistent-soft use-package quelpa async) +(defvar doom-core-packages + '(persistent-soft use-package quelpa async load-env-vars) "A list of packages that must be installed (and will be auto-installed if missing) and shouldn't be deleted.") diff --git a/core/core.el b/core/core.el index 1c04086b8..0a75a04fc 100644 --- a/core/core.el +++ b/core/core.el @@ -450,11 +450,12 @@ to least)." (unless (or force-p (doom-initialize-autoloads doom-package-autoload-file) noninteractive) - (user-error "Your package autoloads are missing! Run `bin/doom refresh' to regenerate them")))) + (user-error "Your package autoloads are missing! Run `bin/doom refresh' to regenerate them"))) - ;; Load shell environment - (when (file-readable-p doom-env-file) - (load-env-vars doom-env-file)) + ;; Load shell environment + (unless noninteractive + (when (file-readable-p doom-env-file) + (load-env-vars doom-env-file)))) (require 'core-lib) (require 'core-modules) diff --git a/core/packages.el b/core/packages.el index c2fc0b143..ad01ecc9a 100644 --- a/core/packages.el +++ b/core/packages.el @@ -2,7 +2,6 @@ ;;; core/packages.el ;; core.el -(package! load-env-vars) (package! dotenv-mode) ;; core-os.el