pacdiff: Add option to overwrite, clarify remove option
Signed-off-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
495460d717
commit
163ba4016e
|
@ -97,15 +97,16 @@ while IFS= read -u 3 -r -d '' pacfile; do
|
||||||
echo " Files are identical, removing..."
|
echo " Files are identical, removing..."
|
||||||
rm -v "$pacfile"
|
rm -v "$pacfile"
|
||||||
else
|
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
|
while read c; do
|
||||||
case $c in
|
case $c in
|
||||||
r|R) rm -v "$pacfile"; break ;;
|
r|R) rm -v "$pacfile"; break ;;
|
||||||
|
o|O) mv -v "$pacfile" "$file"; break ;;
|
||||||
v|V)
|
v|V)
|
||||||
$diffprog "$pacfile" "$file"
|
$diffprog "$pacfile" "$file"
|
||||||
rm -iv "$pacfile"; break ;;
|
rm -iv "$pacfile"; break ;;
|
||||||
s|S) 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
|
esac
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue