summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2012-12-19 23:21:06 +0100
committerAllan McRae <allan@archlinux.org>2013-01-03 03:03:10 +0100
commit6a804d55ddf150c8b716747f0c46750de06679b2 (patch)
tree0f79288fc9d118618bfd8740074bb733c5e5e680
parentdd3762edc4b1eb0cde2610164fd4f1a496e671b9 (diff)
downloadpacman-6a804d55ddf150c8b716747f0c46750de06679b2.tar.gz
pacman-6a804d55ddf150c8b716747f0c46750de06679b2.tar.xz
pacdiff: be more verbose if we rename or remove
Doesn't hurt and reassures the user that we did the right thing. Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--contrib/pacdiff.sh.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in
index 58494e19..f31e17c8 100644
--- a/contrib/pacdiff.sh.in
+++ b/contrib/pacdiff.sh.in
@@ -89,21 +89,21 @@ while IFS= read -u 3 -r -d '' pacfile; do
printf " file found for $PURPLE%s$ALL_OFF\n" "$file"
if [ ! -f "$file" ]; then
echo " $file does not exist"
- rm -i "$pacfile"
+ rm -iv "$pacfile"
continue
fi
check="$(cmp "$pacfile" "$file")"
if [ -z "${check}" ]; then
echo " Files are identical, removing..."
- rm "$pacfile"
+ rm -v "$pacfile"
else
echo -n " File differences found. (V)iew, (S)kip, (R)emove: [v/s/r] "
while read c; do
case $c in
- r|R) rm "$pacfile"; break ;;
+ r|R) rm -v "$pacfile"; break ;;
v|V)
$diffprog "$pacfile" "$file"
- rm -i "$pacfile"; break ;;
+ rm -iv "$pacfile"; break ;;
s|S) break ;;
*) echo -n " Invalid answer. Try again: [v/s/r] "; continue ;;
esac