improve for doom-emacs

This commit is contained in:
Rongsong Shen 2020-05-12 15:24:49 +08:00
parent 3fcfae94b7
commit c799f90e39

View File

@ -93,6 +93,12 @@
(progn (progn
(setenv "SPACEMACSDIR" spacemacs-dir)))) (setenv "SPACEMACSDIR" spacemacs-dir))))
(defun my-doom-dir (config-dir)
(concat config-dir "/doom"))
(defun my-doom-local-dir (config-dir)
(concat config-dir "/local"))
(defun gen-doom-install-script (branch install-dir config-dir) (defun gen-doom-install-script (branch install-dir config-dir)
(if (string= branch "master") (if (string= branch "master")
(list (list
@ -100,19 +106,22 @@
"git clone https://github.com/hlissner/doom-emacs.git %s" "git clone https://github.com/hlissner/doom-emacs.git %s"
install-dir) install-dir)
(format "cd %s" install-dir) (format "cd %s" install-dir)
(format "DOOMDIR=%s ./bin/doom install" (format "./bin/doom -y --doomdir %s --localdir %s install"
config-dir)) (my-doom-dir config-dir)
(my-doom-local-dir config-dir)))
(list (list
(format (format
"git clone -b %s https://github.com/hlissner/doom-emacs.git %s" "git clone -b %s https://github.com/hlissner/doom-emacs.git %s"
branch install-dir) branch install-dir)
(format "cd %s" install-dir) (format "cd %s" install-dir)
(format "DOOMDIR=%s ./bin/doom install" (format "./bin/doom -y --doomdir %s --localdir %s install"
config-dir)))) (my-doom-dir config-dir)
(my-doom-local-dir config-dir)))))
(defun doom-load (install-dir config-dir) (defun doom-load (install-dir config-dir)
(progn (progn
(setenv "DOOMDIR" config-dir) (setenv "DOOMDIR" (my-doom-dir config-dir))
(setenv "DOOMLOCALDIR" (my-doom-local-dir config-dir))
(load-file emacs-init-file))) (load-file emacs-init-file)))
(defun gen-easy-install-script (branch install-dir config-dir) (defun gen-easy-install-script (branch install-dir config-dir)