TakeV
/
spacemacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make default private layer directory explicit

This commit is contained in:
justbur 2015-06-05 19:50:03 -04:00 committed by syl20bnr
parent e1eed07c30
commit 252f26d555
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/core-configuration-layer.el
View File

@ -43,6 +43,17 @@
(expand-file-name (concat user-emacs-directory "private/"))
"Spacemacs private layers base directory.")
(defconst configuration-layer-private-layer-directory
(let ((dotspacemacs-layer-dir
(when dotspacemacs-directory
(expand-file-name
(concat dotspacemacs-directory "layers/")))))
(if (and dotspacemacs-directory
(file-exists-p dotspacemacs-layer-dir))
dotspacemacs-layer-dir
configuration-layer-private-directory))
"Spacemacs default directory for private layers.")
(defconst configuration-layer-rollback-directory
(expand-file-name (concat spacemacs-cache-directory ".rollback/"))
"Spacemacs rollback directory.")
@ -118,7 +129,7 @@ layer directory."
(interactive)
(let* ((current-layer-paths (mapcar (lambda (dir) (expand-file-name dir))
(cl-pushnew
configuration-layer-private-directory
configuration-layer-private-layer-directory
dotspacemacs-configuration-layer-path)))
(other-choice "Another directory...")
(helm-lp-source
@ -152,7 +163,7 @@ layer directory."
(defun configuration-layer//get-private-layer-dir (name)
"Return an absolute path the the private configuration layer with name
NAME."
(concat configuration-layer-private-directory name "/"))
(concat configuration-layer-private-layer-directory name "/"))
(defun configuration-layer//copy-template (template &optional layer-dir)
"Copy and replace special values of TEMPLATE to LAYER_DIR. If
@ -213,7 +224,7 @@ path."
;; `dotspacemacs-directory' override the private directory if it exists.
(let ((search-paths (append (list configuration-layer-contrib-directory)
dotspacemacs-configuration-layer-path
(list configuration-layer-private-directory)
(list configuration-layer-private-layer-directory)
(list dotspacemacs-directory)))
(discovered '())
(result (make-hash-table :size 256)))

4
core/core-dotspacemacs.el
View File

@ -15,7 +15,7 @@
(defconst dotspacemacs-directory
(let* ((env (getenv "SPACEMACSDIR"))
(env-dir (if env (expand-file-name (concat env "/"))))
(env-dir (when env (expand-file-name (concat env "/"))))
(no-env-dir-default (expand-file-name
(concat user-home-directory
".spacemacs.d/"))))
@ -33,7 +33,7 @@ directories exist, this variable will be nil.")
(defconst dotspacemacs-filepath
(let* ((default (concat user-home-directory ".spacemacs"))
(spacemacs-dir-init (if dotspacemacs-directory
(spacemacs-dir-init (when dotspacemacs-directory
(concat dotspacemacs-directory
"init.el"))))
(if (and (not (file-exists-p default))