From 8ea0f3427088f59166fa814921b2395bd43a2f72 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Mon, 21 May 2018 16:51:38 +0200 Subject: [PATCH] doctor: update doom bootstrap logic & fix error on built-in packages --- bin/doom-doctor | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/bin/doom-doctor b/bin/doom-doctor index 33121fea9..2f2030a1f 100755 --- a/bin/doom-doctor +++ b/bin/doom-doctor @@ -275,11 +275,9 @@ (let (doom-core-packages doom-debug-mode) (condition-case ex - (let ((inhibit-message t) - (noninteractive t)) + (let ((inhibit-message t)) (load (concat user-emacs-directory "init.el") nil t) - (doom-initialize) - (doom|run-all-startup-hooks) + (doom-initialize-modules) (success! "Attempt to load DOOM: success! Loaded v%s" doom-version)) ('error (warn! "Attempt to load DOOM: failed\n %s\n" @@ -302,7 +300,8 @@ (doom--stage 'packages)) (when (load packages-file t t) (dolist (package (cl-remove-if #'package-installed-p doom-packages :key #'car)) - (error! "%s is not installed" (car package)))) + (unless (package-built-in-p (car package)) + (error! "%s is not installed" (car package))))) (let ((doom--stage 'doctor)) (load doctor-file t t))))) ('error