about summary refs log tree commit diff
path: root/ci
diff options
context:
space:
mode:
authorWilliam Carroll <wpcarro@gmail.com>2020-09-02T13·18+0100
committerWilliam Carroll <wpcarro@gmail.com>2020-09-02T13·18+0100
commit8806604d405525e9886e6e9004adf6200ca5cf9f (patch)
treee67ba7fe4644f81c56a4ac4ebe543df1574e2f32 /ci
parent4a6937106559892f601999a6f3cae9beff1fe5f1 (diff)
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
Diffstat (limited to 'ci')
-rw-r--r--ci/pipelines/script.el29
1 files changed, 22 insertions, 7 deletions
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)