From c799f90e39d36582421db11979019fb8236c6863 Mon Sep 17 00:00:00 2001 From: Rongsong Shen Date: Tue, 12 May 2020 15:24:49 +0800 Subject: [PATCH] improve for doom-emacs --- init/multi-emacs-config.el | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/init/multi-emacs-config.el b/init/multi-emacs-config.el index 41dd93b..2dbecea 100644 --- a/init/multi-emacs-config.el +++ b/init/multi-emacs-config.el @@ -93,26 +93,35 @@ (progn (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) (if (string= branch "master") (list (format - "git clone https://github.com/hlissner/doom-emacs.git %s" - install-dir) + "git clone https://github.com/hlissner/doom-emacs.git %s" + install-dir) (format "cd %s" install-dir) - (format "DOOMDIR=%s ./bin/doom install" - config-dir)) + (format "./bin/doom -y --doomdir %s --localdir %s install" + (my-doom-dir config-dir) + (my-doom-local-dir config-dir))) (list (format "git clone -b %s https://github.com/hlissner/doom-emacs.git %s" branch install-dir) (format "cd %s" install-dir) - (format "DOOMDIR=%s ./bin/doom install" - config-dir)))) + (format "./bin/doom -y --doomdir %s --localdir %s install" + (my-doom-dir config-dir) + (my-doom-local-dir config-dir))))) (defun doom-load (install-dir config-dir) (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))) (defun gen-easy-install-script (branch install-dir config-dir)