From 1270933f44be48abfcba357cc16b5409adf92b75 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Fri, 12 Jun 2020 16:41:19 -0400 Subject: [PATCH] Remove --{emacs,doom,local}dir options These options aren't properly supported in this version of the CLI. Changing the localdir, for instance, doesn't affect when straight is first bootstrapped. Chaning emacsdir doesn't matter for the first run. I'm working on a CLI rewrite that will reimplement --doomdir and --localdir at least, but for now it's best I just remove these. They can still be customized using the EMACSDIR, DOOMDIR, and DOOMLOCALDIR envvars. Closes #3367 --- bin/doom | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/bin/doom b/bin/doom index bf17b439c..fee5c1b68 100755 --- a/bin/doom +++ b/bin/doom @@ -40,9 +40,6 @@ ((help-p ["-h" "--help"] "Same as help command") (debug-p ["-d" "--debug"] "Turns on doom-debug-p (and debug-on-error)") (yes-p ["-y" "--yes"] "Auto-accept all confirmation prompts") - (emacsdir ["--emacsdir" dir] "Use the emacs config at DIR (e.g. ~/.emacs.d)") - (doomdir ["--doomdir" dir] "Use the private module at DIR (e.g. ~/.doom.d)") - (localdir ["--localdir" dir] "Use DIR as your local storage directory") &optional command &rest args) "A command line interface for managing Doom Emacs. @@ -51,15 +48,6 @@ Includes package management, diagnostics, unit tests, and byte-compilation. This tool also makes it trivial to launch Emacs out of a different folder or with a different private module." :bare t - (when emacsdir - (setq user-emacs-directory (file-name-as-directory emacsdir)) - (print! (info "EMACSDIR=%s") emacsdir)) - (when doomdir - (setenv "DOOMDIR" (file-name-as-directory doomdir)) - (print! (info "DOOMDIR=%s") localdir)) - (when localdir - (setenv "DOOMLOCALDIR" (file-name-as-directory localdir)) - (print! (info "DOOMLOCALDIR=%s") localdir)) (when debug-p (setenv "DEBUG" "1") (setq doom-debug-p t) @@ -81,10 +69,6 @@ with a different private module." (unless (or doom-auto-accept (y-or-n-p "Continue anyway?")) (user-error "Aborted"))) - ;; Reload core in case any of the directories were changed. - (when (or emacsdir doomdir localdir) - (load! "core/core.el" user-emacs-directory)) - ;; Load any the user's private init.el or any cli.el files in modules. This ;; gives the user (and modules) an opportunity to define their own CLI ;; commands, or to customize the CLI to better suit them.