From 163ba4016efb0628a16c4dd882fb6a2030b3efef Mon Sep 17 00:00:00 2001 From: Florian Pritz <bluewind@xinu.at> Date: Wed, 19 Dec 2012 23:22:22 +0100 Subject: pacdiff: Add option to overwrite, clarify remove option Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org> --- contrib/pacdiff.sh.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 095f7b6e..28569753 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -97,15 +97,16 @@ while IFS= read -u 3 -r -d '' pacfile; do echo " Files are identical, removing..." rm -v "$pacfile" else - echo -n " File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] " + printf " (V)iew, (S)kip, (R)emove %s, (O)verwrite with %s: [v/s/r/o] " "$file_type" "$file_type" while read c; do case $c in r|R) rm -v "$pacfile"; break ;; + o|O) mv -v "$pacfile" "$file"; break ;; v|V) $diffprog "$pacfile" "$file" rm -iv "$pacfile"; break ;; s|S) break ;; - *) echo -n " Invalid answer. Try again: [v/s/r] "; continue ;; + *) printf " Invalid answer. Try again: [v/s/r/o] "; continue ;; esac done fi -- cgit v1.2.3-70-g09d2