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

doctor: make feedback more informative

Browse source
This commit is contained in:
Henrik Lissner 2018-05-21 16:50:54 +02:00
parent 4e18722d49
commit 6a08128194
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395
1 changed files with 17 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

25
bin/doom-doctor
View file

@ -18,6 +18,7 @@
;; ;;
(defvar doom-init-p nil) (defvar doom-init-p nil)
(defvar doom-warnings 0)
(defvar doom-errors 0) (defvar doom-errors 0)
(defmacro when! (cond &rest body) (defmacro when! (cond &rest body)
(declare (indent defun)) (declare (indent defun))
@ -62,7 +63,7 @@
(format (concat prefix ,msg) (format (concat prefix ,msg)
,@args)))) ,@args))))
(defmacro error! (&rest args) `(progn (msg! (color 31 ,@args)) (setq doom-errors (+ doom-errors 1)))) (defmacro error! (&rest args) `(progn (msg! (color 31 ,@args)) (setq doom-errors (+ doom-errors 1))))
(defmacro warn! (&rest args) `(progn (msg! (color 33 ,@args)) (setq doom-errors (+ doom-errors 1)))) (defmacro warn! (&rest args) `(progn (msg! (color 33 ,@args)) (setq doom-warnings (+ doom-warnings 1))))
(defmacro success! (&rest args) `(msg! (color 32 ,@args))) (defmacro success! (&rest args) `(msg! (color 32 ,@args)))
(defmacro section! (&rest args) (defmacro section! (&rest args)
`(msg! (color 1 (color 34 ,@args)))) `(msg! (color 1 (color 34 ,@args))))
@ -137,11 +138,13 @@
;; --- is the environment set up properly? -------------------- ;; --- is the environment set up properly? --------------------
;; on windows? ;; on windows?
(section! "Checking your OS...")
(when (memq system-type '(windows-nt ms-dos cygwin)) (when (memq system-type '(windows-nt ms-dos cygwin))
(warn! "Warning: Windows detected") (warn! "Warning: Windows detected")
(explain! "DOOM was designed for MacOS and Linux. Expect a bumpy ride!")) (explain! "DOOM was designed for MacOS and Linux. Expect a bumpy ride!"))
;; are all default fonts present? ;; are all default fonts present?
(section! "Checking your fonts...")
(if (not (fboundp 'find-font)) (if (not (fboundp 'find-font))
(progn (progn
(warn! "Warning: unable to detect font") (warn! "Warning: unable to detect font")
@ -164,6 +167,7 @@
"case, ignore this warning.")))))) "case, ignore this warning."))))))
;; gnutls-cli & openssl ;; gnutls-cli & openssl
(section! "Checking gnutls/openssl...")
(cond ((executable-find "gnutls-cli")) (cond ((executable-find "gnutls-cli"))
((executable-find "openssl") ((executable-find "openssl")
(let* ((output (sh "openssl ciphers -v")) (let* ((output (sh "openssl ciphers -v"))
@ -199,6 +203,7 @@
"or just about anyone who knows more about computers than you do!"))) "or just about anyone who knows more about computers than you do!")))
;; are certificates validated properly? ;; are certificates validated properly?
(section! "Testing your root certificates...")
(cond ((not (string-match-p "\\_<GNUTLS\\_>" system-configuration-features)) (cond ((not (string-match-p "\\_<GNUTLS\\_>" system-configuration-features))
(warn! "Warning: You didn't install Emacs with gnutls support") (warn! "Warning: You didn't install Emacs with gnutls support")
(explain! (explain!
@ -248,6 +253,7 @@
((error! "Nope!"))) ((error! "Nope!")))
;; which variant of tar is on your system? bsd or gnu tar? ;; which variant of tar is on your system? bsd or gnu tar?
(section! "Checking for GNU/BSD tar...")
(let ((tar-bin (or (executable-find "gtar") (let ((tar-bin (or (executable-find "gtar")
(executable-find "tar")))) (executable-find "tar"))))
(if tar-bin (if tar-bin
@ -268,7 +274,6 @@
;; --- are your modules set up properly? ---------------------- ;; --- are your modules set up properly? ----------------------
(message "\n----")
(let (doom-core-packages doom-debug-mode) (let (doom-core-packages doom-debug-mode)
(condition-case ex (condition-case ex
(let ((inhibit-message t) (let ((inhibit-message t)
@ -283,7 +288,7 @@
(setq doom-modules nil)))) (setq doom-modules nil))))
(when (bound-and-true-p doom-modules) (when (bound-and-true-p doom-modules)
(section! "Running module doctors...") (section! "Checking your enabled modules...")
(let ((indent 4)) (let ((indent 4))
(advice-add #'require :around #'doom*shut-up) (advice-add #'require :around #'doom*shut-up)
(maphash (maphash
@ -306,9 +311,13 @@
doom-modules))) doom-modules)))
;; ;;
(message "\n----") (message "\n")
(if (> doom-errors 0) (dolist (msg (list (list doom-errors "error" 31)
(warn! "There %s!" (list doom-warnings "warning" 33)))
(format (if (= doom-errors 1) "is %d issue" "are %d issues") (when (> (car msg) 0)
doom-errors)) (message (color (nth 2 msg) (if (= (car msg) 1) "There is %d %s!" "There are %d %ss!")
(car msg) (nth 1 msg)))))
(when (and (zerop doom-errors)
(zerop doom-warnings))
(success! "Everything seems fine, happy Emacs'ing!")) (success! "Everything seems fine, happy Emacs'ing!"))