Commit Graph

195 Commits

Author SHA1 Message Date
pancho horrillo
3861225f0b Fix 'too many arguments' error on org-capture
org-capture foo bar baz

will fail with:

org/capture: line 33: [: too many arguments

Adding quotes to the expansion of $str will ensure that test -z has
only one argument.
2021-03-08 10:42:06 +01:00
Eric Drechsel
269dab615c org-capture: text from args, else stdin
old behavior was to use stdin in non-interactive
This prevented binding eg in qutebrowser
2021-03-07 00:48:32 -08:00
Henrik Lissner
1274de3d34 Minor reformatting & refactors across the board 2021-02-25 13:59:43 -05:00
Henrik Lissner
3894611a8f Minor comment revision 2021-02-21 14:44:59 -05:00
Henrik Lissner
eea4709354
cli: run post-script indirectly
Fixes cases where /tmp is mounted with noexec.
2020-12-12 15:56:36 -05:00
Henrik Lissner
b5e948054c
Refactor & reformat core.el
Backport a bit of core.el from our CLI rewrite.
2020-12-02 17:58:09 -05:00
Henrik Lissner
b49c40bbb3
Minor refactors & comment revision 2020-11-29 14:37:32 -05:00
Henrik Lissner
03c6a352bf
Ensure site subdirs.el are loaded 2020-11-20 14:10:29 -05:00
Henrik Lissner
4dab595ad3
Minor refactors & comment revision 2020-11-20 14:10:29 -05:00
Henrik Lissner
5940d931f4
Fix "read only variable" errors on doom {sync,upgrade}
Relevant to #3844
2020-09-01 15:32:01 -04:00
Henrik Lissner
e03824bf5e
bin/doom: improve POSIX compliance
+ The bourne shell does not guarantee it'll understand the new $()
  subshell syntax.
+ Can't rely on set -e to short circuit the script. No avoiding the
  roundabout suppression of the postscript error with '&& true'.

Might fix #3844, but doubt it.
2020-08-27 14:42:48 -04:00
Henrik Lissner
a2a5038b97
Fix #3844: bin/doom emits wrong-type-arg error on windows
For some reason __DOOMPOST isn't being exported into emacs' environment
on Windows (powershell and git bash).
2020-08-27 01:10:08 -04:00
Henrik Lissner
a6dc9bf7e5
core-cli: minor refactors 2020-08-27 01:10:08 -04:00
Henrik Lissner
47b42a9d08
Don't exec postscript #3746
Doesn't seem to persist exported environment variables (like __DOOMPOST)
in some windows environments.
2020-08-25 20:22:06 -04:00
Henrik Lissner
239516a7db
Fix #3831: integer expression expected error on bin/doom
Also mentioned in #3746
2020-08-25 13:24:45 -04:00
Henrik Lissner
63a03848a3
Fix literate tangling on 'doom sync'
Relevant to #3746
2020-08-25 06:01:35 -04:00
Henrik Lissner
c0500df5fb
bin/doom: move debugger config to core-cli
And remove unnecessary path expansion.
2020-08-25 05:08:22 -04:00
Henrik Lissner
93ac32d082
bin/doom: refactor shebang preamble
Indirectly fixes folks' ability to set EMACS to more complex
commands (like 'flatpak run org.gnu.emacs').
2020-08-25 05:08:14 -04:00
Henrik Lissner
4fa0241134
bin/doom: allow script to be symlinked #3746 2020-08-24 23:19:42 -04:00
Henrik Lissner
e632871a11
core-cli: backport more refactors from rewrite
Still a long way to go, but this introduces a few niceties for
debugging CLI failures:

+ The (extended) output of the last bin/doom command is now logged to
  ~/.emacs.d/.local/doom.log
+ If an error occurs, short backtraces are displayed whether or not you
  have debug mode on. The full backtrace is written to
  ~/.emacs.d/.local/doom.error.log.
+ bin/doom now aborts with a warning if:
  - The script itself or its parent directory is a symlink. It's fine if
    ~/.emacs.d is symlinked though.
  - Running bin/doom as root when your DOOMDIR isn't in /root/.
  - If you're sporting Emacs 26.1 (now handled in the elisp side rather
    than the /bin/sh shebang preamble).
+ If a 'doom sync' was aborted prematurely, you'll be warned that Doom
  was left in an inconsistent state and that you must run `doom sync`
  again.

May address #3746
2020-08-24 23:00:32 -04:00
Diego Zamboni
394c9b5a70 Fix string comparison in TERM check
Script was using -eq, which is a numeric comparison, and was producing
an "integer expression expected" error. Changed to =, the string
comparison operator.
2020-08-24 14:42:45 +02:00
Henrik Lissner
10d25be4ed
bin/org-capture: TERM=xterm-256color in alacritty 2020-08-21 15:49:36 -04:00
Henrik Lissner
9b991fc29f
Fix #3781: revert 55b87b3a9 2020-08-19 12:10:14 -04:00
Henrik Lissner
55b87b3a94
bin/doom: source postscript instead
This way the postscript can refer to the doom script via "$0" and its
arguments via "$@" (making it easier for cli commands to rerun the last
command).
2020-08-18 20:32:34 -04:00
Henrik Lissner
d9739a2d10
Fix #3727: 'doom: command not found' error on 'doom upgrade' 2020-08-11 14:26:49 -04:00
Henrik Lissner
eb9cb0c6e9
Fix org version conflicts due to literate config #3649
Tangling would load org libraries. If org hasn't been installed yet,
this means the older version is loaded, later interfering with the
installation and byte-compilation of the new package, causing down the
road.
2020-08-09 01:50:42 -04:00
Henrik Lissner
4b96039374
bin/org-tangle: expand #+INCLUDE directives
See 711e68770 for details.
2020-07-25 22:57:22 -04:00
Henrik Lissner
1270933f44
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
2020-06-12 16:43:46 -04:00
Henrik Lissner
ba817cb1ff
Speed up bin/doom by staving off GC
This effectively halves the runtime of 'doom sync' and 'doom doctor',
and shaves 5-10% off other commands.
2020-05-27 02:55:22 -04:00
Henrik Lissner
a814239ec7
Implement daisy-chaining for CLI sessions
elisp lacks an execv implementation (or mature subprocess library), so
we exploit some splenderiffic hackery to get Emacs to execute arbitrary
shell commands after a 'doom ...' command completes. This allows us to
daisy chain doom commands in distinct sessions (wonderful for reloading
doom after a 'doom upgrade', which we do). This minimizes errors when a
'doom upgrade' pulls in breaking changes to Doom's CLI.

We also bring 'doom run' into elisp, since this new functionality
enables us to.
2020-05-26 02:30:54 -04:00
Henrik Lissner
cc5f498586
Add magic cli.el in modules & refactor module init
Doom now looks for cli.el files in your private directory or modules,
giving them an opportunity to customize the CLI (add commands or
reconfigure existing ones) to suit their purposes.
2020-05-25 15:55:28 -04:00
Henrik Lissner
3a38fc633c
Change doom-{interactive,debug}-mode suffix to -p
Because these are not really modes.

Also makes `doom-debug-mode` an actual (global) minor mode.
2020-05-25 03:43:40 -04:00
Henrik Lissner
98d7b97d33
Fix 'doom run' not (re)executing startup hooks
Makes leader keys (among other things) unable to function.
2020-05-17 06:14:37 -04:00
Henrik Lissner
805976b8bd
Handle the case where EMACSDIR has no trailing slash 2020-05-15 04:53:59 -04:00
Henrik Lissner
0e851ace9b
Backport bits of CLI rewrite
The rewrite for Doom's CLI is taking a while, so I've backported a few
important changes in order to ease the transition and fix a couple bugs
sooner.

Fixes #2802, #2737, #2386

The big highlights are:

- Fix #2802: We now update recipe repos *before* updating/installing any
  new packages. No more "Could not find package X in recipe repositories".

- Fix #2737: An edge case where straight couldn't reach a pinned
  commit (particularly with agda).

- Doom is now smarter about what option it recommends when straight
  prompts you to make a choice.

- Introduces a new init path for Doom. The old way:
  - Launch in "minimal" CLI mode in non-interactive sessions
  - Launch a "full" interactive mode otherwise.
  The new way
  - Launch in "minimal" CLI mode *only* for bin/doom
  - Launch is a simple mode for non-interactive sessions that still need
    access to your interactive config (like async org export/babel).
  - Launch a "full" interactive mode otherwise.

  This should fix compatibility issues with plugins that use the
  async.el library or spawn child Emacs processes to fake
  parallelization (like org's async export and babel functionality).

- Your private init.el is now loaded more reliably when running any
  bin/doom command. This gives you an opportunity to configure its
  settings.

- Added doom-first-{input,buffer,file}-hook hooks, which we use to queue
  deferred activation of a number of packages. Users can remove these
  modes from these hooks; altogether preventing them from loading,
  rather than waiting for them to load to then disable them,
  e.g. (after! smartparens (smartparens-global-mode -1)) -> (remove-hook
  'doom-first-buffer #'smartparens-global-mode)

  Hooks added to doom-first-*-hook variables will be removed once they
  run.

  This should also indirectly fix #2386, by preventing interactive modes
  from running in non-interactive session.

- Added `doom/bump-*` commands to make bumping modules and packages
  easier, and `doom/bumpify-*` commands for converting package!
  statements into user/repo@sha1hash format for bump commits.

- straight.el is now commit-pinned, like all other packages. We also
  more reliably install straight.el by cloning it ourselves, rather than
  relying on its bootstrap.el.

  This should prevent infinite "straight has diverged from master"
  prompts whenever we change branches (though, you might have to put up
  with it one more after this update -- see #2937 for workaround).

All the other minor changes:

- Moved core/autoload/cli.el to core/autoload/process.el
- The package manager will log attempts to check out pinned commits
- If package state is incomplete while rebuilding packages, emit a
  simpler error message instead of an obscure one!
- Added -u switch to 'doom sync' to make it run 'doom update' afterwards
- Added -p switch to 'doom sync' to make it run 'doom purge' afterwards
- Replace doom-modules function with doom-modules-list
- The `with-plist!` macro was removed, since `cl-destructuring-bind`
  already serves that purpose well enough.
- core/autoload/packages.el was moved into core-packages.el
- bin/doom will no longer die if DOOMDIR or DOOMLOCALDIR don't have a
  trailing slash
- Introduces doom-debug-variables; a list of variables to toggle on
  doom/toggle-debug-mode.
- The sandbox has been updated to reflect the above changes, also:
  1. Child instances will no longer inherit the process environment of
     the host instance,
  2. It will no longer produce an auto-save-list directory in ~/.emacs.d
2020-05-15 01:33:52 -04:00
Henrik Lissner
aa64ece46d
Silence deprecation & site-file loading messages in CLI 2020-05-04 16:51:21 -04:00
Henrik Lissner
cdaa55b4db
Rename org-capture frame to doom-capture
To reduce likelihood of conflicts.
2020-03-01 01:39:14 -05:00
Michael Sanders
413171cfc9
bin/org-capture: Suppress output for initial emacsclient call 2020-02-29 17:57:44 -08:00
Henrik Lissner
981ed73e66
Fix void-variable straight-process-buffer error #2596 2020-02-24 22:56:58 -05:00
Henrik Lissner
f7445a10db
General refactor & reformatting across the board 2020-02-18 22:56:47 -05:00
Rafael Accácio Nogueira
b22f7005f8 use OPTARG to get key 2020-02-10 11:36:55 +01:00
Henrik Lissner
4bd59f5ed9
Dump *straight-process* buffer after straight errors 2020-01-08 22:07:03 -05:00
Henrik Lissner
637243a7e8
Merge pull request #2304 from rohitpaulk/fix-empty-help
cli: Handle --help without an argument
2020-01-05 20:10:11 -05:00
Paul Kuruvilla
8818f2f7e8 cli: Handle --help without an argument 2020-01-04 11:32:14 +05:30
Henrik Lissner
960d756b47
General, minor refactors 2019-12-30 18:23:56 -05:00
Henrik Lissner
2ed4e0d55c
bin/doom: warn if run as root 2019-12-20 21:48:25 -05:00
Henrik Lissner
1e6ef4d6e4
Rewrite interactive CLI commands
- Replace doom//upgrade with doom/upgrade
- Replace doom//autoloads with doom/reload-autoloads
- Replace doom//refresh with doom/reload
- Remove doom//install; there should be no workflow for this command
- Remove doom//autoremove; autoremove was replaced with purge. Maybe
  I'll write a doom//purge analogue. Not sure yet.
- Use compile instead of hacky wrapper around core-cli API

Rewrite interactive CLI commands

- Rewrite doom//upgrade & doom//autoloads
- Remove doom//install; there really should be no use-case for it
- Remove doom//autoremove; autoremove was replaced with purge. I'll get
  around to writing a doom//purge eventually.

fixup! Rewrite interactive CLI commands
2019-12-13 16:17:05 -05:00
Henrik Lissner
ecb76d536b
cli: clarify post-error debug mode instructions 2019-12-08 00:56:11 -05:00
Henrik Lissner
873fc5c0db
Rewrite core-cli
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
2019-11-08 16:02:06 -05:00
Rudi Grinberg
55e00bbd26 re-search-forward to search-forward when no re
When no regular expression is present, it's faster and simpler to use
search-forward

Signed-off-by: Rudi Grinberg <rudi.grinberg@gmail.com>
2019-10-13 12:25:41 +09:00