Prevent C-c C-p sandbox from loading private modules

And don't change doom-private-dir, as it isn't necessary and it affects
the purity of the test environment.
This commit is contained in:
Henrik Lissner 2019-09-06 15:37:40 -04:00
parent 280a2407ab
commit 4bc65a3f78
No known key found for this signature in database
GPG key ID: 5F6C0EA160557395

View file

@ -201,24 +201,23 @@ markdown and copies it to your clipboard, ready to be pasted into bug reports!"
(setq-default buffer-undo-tree (make-undo-tree)))) (setq-default buffer-undo-tree (make-undo-tree))))
(pcase mode (pcase mode
(`vanilla-doom+ ; Doom core + modules - private config (`vanilla-doom+ ; Doom core + modules - private config
`((setq doom-private-dir "/tmp/does/not/exist") `((setq doom-init-modules-p t)
(load-file ,user-init-file) (load-file ,user-init-file)
(setq doom-modules ',doom-modules) (setq doom-modules ',doom-modules)
(maphash (lambda (key plist) (maphash (lambda (key plist)
(let ((doom--current-module key) (let ((doom--current-module key)
(doom--current-flags (plist-get plist :flags))) (doom--current-flags (plist-get plist :flags)))
(load! "init" (plist-get plist :path) t))) (load! "init" (doom-module-locate-path (car key) (cdr key)) t)))
doom-modules) doom-modules)
(maphash (lambda (key plist) (maphash (lambda (key plist)
(let ((doom--current-module key) (let ((doom--current-module key)
(doom--current-flags (plist-get plist :flags))) (doom--current-flags (plist-get plist :flags)))
(load! "config" (plist-get plist :path) t))) (load! "config" (doom-module-locate-path (car key) (cdr key)) t)))
doom-modules) doom-modules)
(run-hook-wrapped 'doom-init-modules-hook #'doom-try-run-hook) (run-hook-wrapped 'doom-init-modules-hook #'doom-try-run-hook)
(doom-run-all-startup-hooks-h))) (doom-run-all-startup-hooks-h)))
(`vanilla-doom ; only Doom core (`vanilla-doom ; only Doom core
`((setq doom-private-dir "/tmp/does/not/exist" `((setq doom-init-modules-p t)
doom-init-modules-p t)
(load-file ,user-init-file) (load-file ,user-init-file)
(doom-run-all-startup-hooks-h))) (doom-run-all-startup-hooks-h)))
(`vanilla ; nothing loaded (`vanilla ; nothing loaded