pashage

commit 104d20027d2d98ce88ee2c20ce376b85d8e2602c
parent 61e55fd661d880d94884704a97c53dd54480bee2
Author: Natasha Kerensikova <natgh@instinctive.eu>
Date:   Sat, 21 Sep 2024 13:57:29 +0000

Copy command allows directory merging, like pass
Diffstat:
M
src/pashage.sh
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/pashage.sh b/src/pashage.sh
@@ -237,7 +237,9 @@ do_copy_move() {
 		LOCAL_ACTION=do_copy_move_dir
 		if [ -d "${PREFIX}/$2" ]; then
 			DEST="${2%/}${2:+/}$(basename "${SRC%/}")/"
-			if [ -e "${PREFIX}/${DEST}" ]; then
+			if [ -e "${PREFIX}/${DEST}" ] \
+			    && [ "${ACTION}" = Move ]
+			then
 				die "Error: $2 already contains" \
 				    "$(basename "${SRC%/}")"
 			fi