From e3f867429758450c74cf557f7490b8469f5d466f Mon Sep 17 00:00:00 2001
From: Henrik Lissner <henrik@lissner.net>
Date: Thu, 5 Dec 2019 15:01:04 -0500
Subject: [PATCH] Group 'doom refresh' with maintenance commands

---
 core/core-cli.el | 62 ++++++++++++++++++++++++------------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/core/core-cli.el b/core/core-cli.el
index 081da1d0d..8a9610393 100644
--- a/core/core-cli.el
+++ b/core/core-cli.el
@@ -219,10 +219,12 @@ BODY will be run when this dispatcher is called."
 (load! "cli/help")
 (load! "cli/install")
 
-(defcli! (refresh re sync)
+(defcligroup! "Maintenance"
+  "For managing your config and packages"
+  (defcli! (refresh re sync)
     ((if-necessary-p ["-n" "--if-necessary"] "Only regenerate autoloads files if necessary")
      (purge-p ["-p" "--purge"] "Also purge orphaned repos and ELPA packages"))
-  "Ensure Doom is properly set up.
+    "Ensure Doom is properly set up.
 
 This is the equivalent of running autoremove, install, autoloads, then
 recompile. Run this whenever you:
@@ -235,30 +237,35 @@ recompile. Run this whenever you:
 It will ensure that unneeded packages are removed, all needed packages are
 installed, autoloads files are up-to-date and no byte-compiled files have gone
 stale."
-  :bare t
-  (print! (green "Initiating a refresh of Doom Emacs...\n"))
-  (let (success)
-    (when (file-exists-p doom-env-file)
-      (doom-cli-reload-env-file 'force))
+    :bare t
+    (print! (green "Initiating a refresh of Doom Emacs...\n"))
+    (let (success)
+      (when (file-exists-p doom-env-file)
+        (doom-cli-reload-env-file 'force))
 
-    (mapc #'doom--cli-delete-autoloads-file
-          (list doom-autoload-file
-                doom-package-autoload-file))
+      (mapc #'doom--cli-delete-autoloads-file
+            (list doom-autoload-file
+                  doom-package-autoload-file))
 
-    (doom-initialize 'force 'noerror)
-    (doom-initialize-modules)
-    (doom-cli-reload-core-autoloads (not if-necessary-p))
-    (unwind-protect
-        (progn
-          (and (doom-cli-packages-install)
-               (setq success t))
-          (and (doom-cli-packages-build)
-               (setq success t))
-          (and (doom-cli-packages-purge purge-p 'builds-p purge-p)
-               (setq success t)))
-      (doom-cli-reload-package-autoloads (or success (not if-necessary-p)))
-      (doom-cli-byte-compile nil 'recompile))
-    t))
+      (doom-initialize 'force 'noerror)
+      (doom-initialize-modules)
+      (doom-cli-reload-core-autoloads (not if-necessary-p))
+      (unwind-protect
+          (progn
+            (and (doom-cli-packages-install)
+                 (setq success t))
+            (and (doom-cli-packages-build)
+                 (setq success t))
+            (and (doom-cli-packages-purge purge-p 'builds-p purge-p)
+                 (setq success t)))
+        (doom-cli-reload-package-autoloads (or success (not if-necessary-p)))
+        (doom-cli-byte-compile nil 'recompile))
+      t))
+
+  (load! "cli/env")
+  (load! "cli/upgrade")
+  (load! "cli/packages")
+  (load! "cli/autoloads"))
 
 (defcligroup! "Diagnostics"
   "For troubleshooting and diagnostics"
@@ -266,13 +273,6 @@ stale."
   (load! "cli/debug")
   (load! "cli/test"))
 
-(defcligroup! "Maintenance"
-  "For managing your config and packages"
-  (load! "cli/env")
-  (load! "cli/upgrade")
-  (load! "cli/packages")
-  (load! "cli/autoloads"))
-
 (defcligroup! "Compilation"
   "For compiling Doom and your config"
   (load! "cli/byte-compile"))