From 8ad5c87107b82696b188bd4190a79c39de613dcc Mon Sep 17 00:00:00 2001 From: NRK Date: Fri, 17 Feb 2023 11:56:28 +0600 Subject: [PATCH] nmv: prefer selection if -u is active the rename plugin always asks for "selection vs current" even when -u flag is active. pass it to the plugin via `NNN_PREFER_SELECTION` so that there's less distracting prompts. --- plugins/.nmv | 15 ++++++++++----- src/nnn.c | 1 + 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/plugins/.nmv b/plugins/.nmv index 37e887de..63b56fa9 100755 --- a/plugins/.nmv +++ b/plugins/.nmv @@ -20,6 +20,7 @@ EDITOR="${EDITOR:-vi}" TMPDIR="${TMPDIR:-/tmp}" NNN_INCLUDE_HIDDEN="${NNN_INCLUDE_HIDDEN:-0}" +NNN_PREFER_SELECTION="${NNN_PREFER_SELECTION:-0}" VERBOSE="${VERBOSE:-0}" RECURSIVE="${RECURSIVE:-0}" @@ -38,12 +39,16 @@ exit_status=0 dst_file=$(mktemp "$TMPDIR/.nnnXXXXXX") if [ -s "$selection" ]; then - printf "Rename 'c'urrent / 's'election? " - read -r resp + if [ "$NNN_PREFER_SELECTION" -eq 1 ]; then + resp="s" + else + printf "Rename 'c'urrent / 's'election? " + read -r resp - if ! [ "$resp" = "c" ] && ! [ "$resp" = "s" ]; then - exit 1 - fi + if ! [ "$resp" = "c" ] && ! [ "$resp" = "s" ]; then + exit 1 + fi + fi fi if [ "$resp" = "s" ]; then diff --git a/src/nnn.c b/src/nnn.c index b351e202..f35fb3f9 100644 --- a/src/nnn.c +++ b/src/nnn.c @@ -7368,6 +7368,7 @@ nochange: case SEL_RENAMEMUL: endselection(TRUE); setenv("NNN_INCLUDE_HIDDEN", xitoa(cfg.showhidden), 1); + setenv("NNN_PREFER_SELECTION", xitoa(cfg.prefersel), 1); setenv("NNN_LIST", listpath ? listroot : "", 1); if (!(getutil(utils[UTIL_BASH])