fix(cli): update 'doom upgrade'

To reflect changes made in 6c0b7e1.

Amend: 6c0b7e1530
This commit is contained in:
Henrik Lissner 2022-06-19 02:34:23 +02:00
parent f4e7e8be56
commit 8816508d6c
No known key found for this signature in database
GPG key ID: B60957CA074D39A3
2 changed files with 4 additions and 4 deletions

View file

@ -83,13 +83,13 @@ Change `$DOOMDIR' with the `--doomdir' option, e.g.
(if (file-exists-p doom-env-file) (if (file-exists-p doom-env-file)
(print! (item "Envvar file already exists, skipping")) (print! (item "Envvar file already exists, skipping"))
(when (or yes? (y-or-n-p "Generate an envvar file? (see `doom help env` for details)")) (when (or yes? (y-or-n-p "Generate an envvar file? (see `doom help env` for details)"))
(doom-cli-reload-env-file 'force-p)))) (call! '(env)))))
;; Install Doom packages ;; Install Doom packages
(if (eq install? :no) (if (eq install? :no)
(print! (warn "Not installing plugins, as requested")) (print! (warn "Not installing plugins, as requested"))
(print! "Installing plugins") (print! "Installing plugins")
(doom-cli-packages-install)) (doom-packages-install))
(print! "Regenerating autoloads files") (print! "Regenerating autoloads files")
(doom-autoloads-reload) (doom-autoloads-reload)
@ -99,7 +99,7 @@ Change `$DOOMDIR' with the `--doomdir' option, e.g.
(print! "Deploying commit-msg and pre-push git hooks") (print! "Deploying commit-msg and pre-push git hooks")
(print-group! (print-group!
(condition-case e (condition-case e
(doom-cli--ci-deploy-hooks yes?) (call! `(ci deploy-hooks ,@(if yes? '("--force"))))
('user-error ('user-error
(print! (warn "%s") (error-message-string e)))))) (print! (warn "%s") (error-message-string e))))))

View file

@ -54,7 +54,7 @@ OPTIONS:
(print-group! (print-group!
(when (and (not noenvvar?) (when (and (not noenvvar?)
(file-exists-p doom-env-file)) (file-exists-p doom-env-file))
(call! '("env"))) (call! '(env)))
(doom-packages-install) (doom-packages-install)
(doom-packages-build) (doom-packages-build)
(when update? (when update?