config-edit: better respect of editor preferences

bevry · Jul 19, 2023 · da51e33 · da51e33
1 parent 3ef481c
commit da51e33
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/commands/config-edit b/commands/config-edit
@@ -142,7 +142,8 @@ function config-edit() (
  sudo-helper -- cat /etc/sudoers | rg --fixed-strings --regexp="$1"
  }
  function default_sudoers_editer {
- env EDITOR="$(edit --dry --terminal)" sudo visudo
+ # --inherit to maintain editor preferences
+ sudo-helper --inherit -- visudo
  }
  ;;
  '--cron-system')
@@ -153,7 +154,8 @@ function config-edit() (
  sudo-helper -- crontab -l | sponge | rg --fixed-strings --regexp="$1"
  }
  function default_cron_system_editer {
- sudo-helper -- env EDITOR="$(edit --dry --terminal)" crontab -e || :
+ # --inherit to maintain editor preferences
+ sudo-helper --inherit -- crontab -e || :
  if is-mac; then
  service-helper --restart -- system/com.vix.cron
  else
@@ -169,7 +171,8 @@ function config-edit() (
  crontab -l | sponge | rg --fixed-strings --regexp="$1"
  }
  function default_cron_user_editer {
- env EDITOR="$(edit --dry --terminal)" crontab -e || :
+ # user contrab already inherits editor preferences
+ crontab -e || :
  if is-mac; then
  service-helper --restart -- system/com.vix.cron
  else

diff --git a/commands/setup-environment-commands b/commands/setup-environment-commands
@@ -575,12 +575,9 @@ if test -z "${LC_CTYPE-}"; then
  LC_CTYPE="$LANG"
 fi
 
-# Checks
+# EDITOR, SUDO_EDITOR doesn't do anything so ignore
 if test -z "${EDITOR-}"; then
- editor="$(edit --dry --prompt || :)"
- if test -n "$editor"; then
- EDITOR="$editor"
- fi
+ EDITOR="$(edit --dry --prompt || :)"
 fi
 
 # =====================================