mirror of
https://github.com/jarun/nnn.git
synced 2024-11-24 11:51:27 +00:00
batch rename: check dep, handle invalid input
This commit is contained in:
parent
03e6d7d553
commit
ea2de804f8
|
@ -26,6 +26,10 @@ dst_file=$(mktemp "$TMPDIR/.nnnXXXXXX")
|
|||
if [ -s "$selection" ]; then
|
||||
printf "Rename 'c'urrent / 's'election? "
|
||||
read -r resp
|
||||
|
||||
if ! [ "$resp" = "c" ] && ! [ "$resp" = "s" ]; then
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$resp" = "s" ]; then
|
||||
|
|
|
@ -431,7 +431,8 @@ static uchar g_states;
|
|||
#define UTIL_FZY 16
|
||||
#define UTIL_NTFY 17
|
||||
#define UTIL_CBCP 18
|
||||
#define UTIL_NMV 19
|
||||
#define UTIL_BASH 19
|
||||
#define UTIL_NMV 20
|
||||
|
||||
/* Utilities to open files, run actions */
|
||||
static char * const utils[] = {
|
||||
|
@ -470,6 +471,7 @@ static char * const utils[] = {
|
|||
"fzy",
|
||||
".ntfy",
|
||||
".cbcp",
|
||||
"bash",
|
||||
".nmv",
|
||||
};
|
||||
|
||||
|
@ -5610,7 +5612,8 @@ nochange:
|
|||
case SEL_RENAMEMUL:
|
||||
endselection();
|
||||
|
||||
if (!plugscript(utils[UTIL_NMV], newpath, path, F_CLI)
|
||||
if (!(getutil(utils[UTIL_BASH])
|
||||
&& plugscript(utils[UTIL_NMV], newpath, path, F_CLI))
|
||||
&& !batch_rename(path)) {
|
||||
printwait(messages[MSG_FAILED], &presel);
|
||||
goto nochange;
|
||||
|
|
Loading…
Reference in a new issue