Handle the case where EMACSDIR has no trailing slash

2020-05-15 04:53:59 -04:00 · 2020-05-15 04:53:59 -04:00 · 805976b8bd
commit 805976b8bd
parent 8f8d796ecd
1 changed files with 4 additions and 1 deletions
--- a/bin/doom
+++ b/bin/doom
@ -12,7 +12,10 @@
 (let* ((loaddir (file-name-directory (file-truename load-file-name)))
       (emacsdir (getenv "EMACSDIR"))
       (user-emacs-directory
-        (abbreviate-file-name (or emacsdir (expand-file-name "../" loaddir)))))
+        (abbreviate-file-name
+         (if emacsdir
+             (file-name-as-directory emacsdir)
+           (expand-file-name "../" loaddir)))))

  ;;
  (load (expand-file-name "core/core.el" user-emacs-directory) nil t)