From 8806604d405525e9886e6e9004adf6200ca5cf9f Mon Sep 17 00:00:00 2001 From: William Carroll Date: Wed, 2 Sep 2020 14:18:50 +0100 Subject: Increase assertiveness of init-emacs script.el TL;DR: - Assert that the path to the init.el exists - Check *Errors* buffer in case an error is uncaught but logged - Log a message when Emacs successfully initializes --- ci/pipelines/script.el | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) (limited to 'ci/pipelines/script.el') diff --git a/ci/pipelines/script.el b/ci/pipelines/script.el index 45b5ea688500..c78c87f33232 100644 --- a/ci/pipelines/script.el +++ b/ci/pipelines/script.el @@ -8,21 +8,36 @@ ;; Dependencies ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(require 'prelude) +(require 'f) (require 'dash) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Script ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(defvar init-el-path (-last-item argv) + "Path to the init.el file that this script attempts to load.") + +(prelude-assert (f-exists? init-el-path)) + (condition-case err - (load (-last-item argv)) + (load init-el-path) (error (message "Encountered an error while attempting to load init.el: %s" err) (kill-emacs 1))) -(if (bufferp "*Warnings*") - (progn - (with-current-buffer "*Warnings*" - (message "Encountered warnings in *Warnings* buffer: %s" (buffer-string))) - (kill-emacs 1)) - (kill-emacs 0)) +(when (bufferp "*Errors*") + (progn + (with-current-buffer "*Errors*" + (message "Encountered errors in *Errors* buffer: %s" (buffer-string))) + (kill-emacs 1))) + +(when (bufferp "*Warnings*") + (progn + (with-current-buffer "*Warnings*" + (message "Encountered warnings in *Warnings* buffer: %s" (buffer-string))) + (kill-emacs 1))) + +(message "Successfully init'd Emacs without encountering errors or warnings!") +(kill-emacs 0) -- cgit 1.4.1