nnn

commit 8eb4cd9e9f1c214bfffdfae91f32eee5ff0f8f30
parent efe445910f93d44ea360e539d1eec323c50c2285
Author: Arun Prakash Jana <engineerarun@gmail.com>
Date:   Sun,  9 Dec 2018 08:00:20 +0530

Use force only in case of rm

Diffstat:
M
src/nnn.c
 | 
16
+++++++---------

1 file changed, 7 insertions(+), 9 deletions(-)
diff --git a/src/nnn.c b/src/nnn.c
@@ -3155,24 +3155,22 @@ nochange:
 				goto nochange;
 			}
 
-			char force = confirm_force();
-
 			if (sel == SEL_CP) {
 				snprintf(g_buf, CMD_LEN_MAX,
 #ifdef __linux__
-					 "xargs -0 -a %s -%c src cp -%cRp src .",
+					 "xargs -0 -a %s -%c src cp -iRp src .",
 #else
-					 "cat %s | xargs -0 -o -%c src cp -%cRp src .",
+					 "cat %s | xargs -0 -o -%c src cp -iRp src .",
 #endif
-					 g_cppath, REPLACE_STR, force);
+					 g_cppath, REPLACE_STR);
 			} else if (sel == SEL_MV) {
 				snprintf(g_buf, CMD_LEN_MAX,
 #ifdef __linux__
-					 "xargs -0 -a %s -%c src mv -%c src .",
+					 "xargs -0 -a %s -%c src mv -i src .",
 #else
-					 "cat %s | xargs -0 -o -%c src mv -%c src .",
+					 "cat %s | xargs -0 -o -%c src mv -i src .",
 #endif
-					 g_cppath, REPLACE_STR, force);
+					 g_cppath, REPLACE_STR);
 			} else { /* SEL_RMMUL */
 				snprintf(g_buf, CMD_LEN_MAX,
 #ifdef __linux__
@@ -3180,7 +3178,7 @@ nochange:
 #else
 					 "cat %s | xargs -0 -o rm -%cr",
 #endif
-					 g_cppath, force);
+					 g_cppath, confirm_force());
 			}
 
 			spawn("sh", "-c", g_buf, path, F_NORMAL | F_SIGINT);