Append slash to DOOMLOCALDIR & DOOMDIR

If needed.
This commit is contained in:
Henrik Lissner 2019-10-29 22:36:51 -04:00
parent 1d09e4655a
commit 63dfd298ca
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -53,7 +53,8 @@ decrease this. If you experience stuttering, increase this.")
"The root directory for Doom's modules. Must end with a slash.")
(defvar doom-local-dir
(or (getenv "DOOMLOCALDIR")
(if-let (localdir (getenv "DOOMLOCALDIR"))
(file-name-as-directory localdir)
(concat doom-emacs-dir ".local/"))
"Root directory for local storage.
@ -76,13 +77,14 @@ Use this for files that change often, like cache files. Must end with a slash.")
"Where Doom's documentation files are stored. Must end with a slash.")
(defvar doom-private-dir
(or (getenv "DOOMDIR")
(let ((xdg-path
(if-let (doomdir (getenv "DOOMDIR"))
(file-name-as-directory doomdir)
(or (let ((xdgdir
(expand-file-name "doom/"
(or (getenv "XDG_CONFIG_HOME")
"~/.config"))))
(if (file-directory-p xdg-path) xdg-path))
"~/.doom.d/")
(if (file-directory-p xdgdir) xdgdir))
"~/.doom.d/"))
"Where your private configuration is placed.
Defaults to ~/.config/doom, ~/.doom.d or the value of the DOOMDIR envvar;