873fc5c0db
Highlights:
- 'doom purge' now purges builds, elpa packages, and repos by default.
Regrafting repos is now opt-in with the -g/--regraft switches.
Negation flags have been added for elpa/repos: -e/--no-elpa and
-r/--no-repos.
- Removed 'doom rebuild' (it is now just 'doom build' or 'doom b').
- Removed 'doom build's -f flag, this is now the default. Added the -r
flag instead, which only builds packages that need rebuilding.
- 'doom update' now updates packages synchronously, but produces more
informative output about the updating process.
- Straight can now prompt in batch mode, which resolves a lot of issues
with 'doom update' (and 'doom upgrade') freezing indefinitely or
throwing repo branch errors.
- 'bin/doom's switches are now positional. Switches aimed at `bin/doom`
must precede any subcommands. e.g.
Do: 'doom -yd upgrade'
Don't do: 'doom upgrade -yd'
- Moved 'doom doctor' from bin/doom-doctor to core/cli/doctor, and
integrated core/doctor.el into it, as to avoid naming conflicts
between it and Emacs doctor.
- The defcli! macro now has a special syntax for declaring flags, their
arguments and descriptions.
Addresses #1981, #1925, #1816, #1721, #1322
98 lines
4.3 KiB
Bash
Executable File
98 lines
4.3 KiB
Bash
Executable File
#!/usr/bin/env sh
|
|
:; ( echo "$EMACS" | grep -q "term" ) && EMACS=emacs || EMACS=${EMACS:-emacs} # -*-emacs-lisp-*-
|
|
:; command -v $EMACS >/dev/null || { >&2 echo "Can't find emacs in your PATH"; exit 1; }
|
|
:; VERSION=$($EMACS --version | head -n1)
|
|
:; case "$VERSION" in *\ 2[0-5].[0-9]) echo "Detected Emacs $VERSION"; echo "Doom only supports Emacs 26.1 and newer"; echo; exit 2 ;; esac
|
|
:; DOOMBASE="$(dirname "$0")/.."
|
|
:; [ "$1" = -d ] || [ "$1" = --debug ] && { shift; export DEBUG=1; }
|
|
:; [ "$1" = run ] && { cd "$DOOMBASE"; shift; exec $EMACS -q --no-splash -l bin/doom "$@"; exit 0; }
|
|
:; exec $EMACS --script "$0" -- "$@"
|
|
:; exit 0
|
|
|
|
(let* ((loaddir (file-name-directory (file-truename load-file-name)))
|
|
(emacsdir (getenv "EMACSDIR"))
|
|
(user-emacs-directory (or emacsdir (expand-file-name "../" loaddir)))
|
|
(load-prefer-newer t))
|
|
|
|
(push (expand-file-name "core" user-emacs-directory) load-path)
|
|
(require 'core)
|
|
(require 'core-cli)
|
|
|
|
(defcli! :main
|
|
((help-p ["-h" "--help"] "Same as help command")
|
|
(debug-p ["-d" "--debug"] "Turns on doom-debug-mode (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.
|
|
|
|
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") localdir))
|
|
(when doomdir
|
|
(setenv "DOOMDIR" doomdir)
|
|
(print! (info "DOOMDIR=%s") localdir))
|
|
(when localdir
|
|
(setenv "DOOMLOCALDIR" localdir)
|
|
(print! (info "DOOMLOCALDIR=%s") localdir))
|
|
(when debug-p
|
|
(setenv "DEBUG" "1")
|
|
(setq doom-debug-mode t)
|
|
(print! (info "Debug mode on")))
|
|
(when yes-p
|
|
(setenv "YES" "1")
|
|
(setq doom-auto-accept t)
|
|
(print! (info "Auto-yes on")))
|
|
(when help-p
|
|
(push command args)
|
|
(setq command "help"))
|
|
|
|
;; Reload core in case any of the directories were changed.
|
|
(when (or emacsdir doomdir localdir)
|
|
(load! "core/core.el" user-emacs-directory))
|
|
|
|
(cond ((not noninteractive)
|
|
(print! "Doom launched out of %s (test mode)" (path user-emacs-directory))
|
|
(load! "init.el" user-emacs-directory)
|
|
(doom-run-all-startup-hooks-h))
|
|
|
|
((null command)
|
|
(doom-cli-execute "help"))
|
|
|
|
((condition-case e
|
|
(let ((start-time (current-time)))
|
|
(and (doom-cli-execute command args)
|
|
(terpri)
|
|
(print! (success "Finished! (%.4fs)")
|
|
(float-time
|
|
(time-subtract (current-time)
|
|
start-time)))))
|
|
(user-error
|
|
(print! (error "%s\n") (error-message-string e))
|
|
(print! (yellow "See 'doom help %s' for documentation on this command.") (car args)))
|
|
((debug error)
|
|
(message "--------------------------------------------------\n")
|
|
(message "There was an unexpected error:")
|
|
(message " %s (%s)" (get (car e) 'error-message) (car e))
|
|
(dolist (item (cdr e))
|
|
(message " %s" item))
|
|
(unless debug-on-error
|
|
(message
|
|
(concat "\nRun the command again with the -d (or --debug) option to enable debug\n"
|
|
"mode and, hopefully, generate a stack trace. If you decide to file a bug\n"
|
|
"report, please include it!\n\n"
|
|
"Emacs outputs to standard error, so you'll need to redirect stderr to\n"
|
|
"stdout to pipe this to a file or clipboard!\n\n"
|
|
" e.g. doom -d install 2>&1 | clipboard-program\n"))
|
|
(signal 'doom-error e)))))))
|
|
|
|
(doom-cli-execute :main (cdr (member "--" argv)))
|
|
(setq argv nil))
|