home-manager: Check VISUAL before EDITOR for editor

Check VISUAL for a visual editor before EDITOR, as per Unix convention
and as followed by Git, crontab, mutt, and other tools.
This commit is contained in:
Scott Stevenson 2024-02-05 22:22:43 +00:00 committed by GitHub
parent 3c6f2dd59c
commit b319781e30
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 6 deletions

View File

@ -97,7 +97,7 @@ Instantiate the configuration and print the resulting derivation\&.
.It Cm edit
.RS 16
Open the home configuration using the editor indicated by \fBEDITOR\fR\&.
Open the home configuration using the editor indicated by \fBVISUAL\fR or \fBEDITOR\fR\&.
.RE
.Pp

View File

@ -565,10 +565,14 @@ function presentNews() {
}
function doEdit() {
if [[ ! -v EDITOR || -z $EDITOR ]]; then
# shellcheck disable=2016
_i 'Please set the $EDITOR environment variable' >&2
return 1
if [[ ! -v VISUAL || -z $VISUAL ]]; then
if [[ ! -v EDITOR || -z $EDITOR ]]; then
# shellcheck disable=2016
_i 'Please set the $EDITOR or $VISUAL environment variable' >&2
return 1
fi
else
EDITOR=$VISUAL
fi
setConfigFile
@ -881,7 +885,7 @@ function doHelp() {
echo
echo " help Print this help"
echo
echo " edit Open the home configuration in \$EDITOR"
echo " edit Open the home configuration in \$VISUAL or \$EDITOR"
echo
echo " option OPTION.NAME"
echo " Inspect configuration option named OPTION.NAME."