pacdiff: Add quit to found pacnew options
Signed-off-by: Jonathan Frazier <eyeswide@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
parent
bcbb6a56a1
commit
9108bfe080
@ -82,16 +82,17 @@ while IFS= read -u 3 -r -d '' pacfile; do
|
||||
msg2 "Files are identical, removing..."
|
||||
rm -v "$pacfile"
|
||||
else
|
||||
ask "(V)iew, (S)kip, (R)emove %s, (O)verwrite with %s: [v/s/r/o] " "$file_type" "$file_type"
|
||||
ask "(V)iew, (S)kip, (R)emove %s, (O)verwrite with %s, (Q)uit: [v/s/r/o/q] " "$file_type" "$file_type"
|
||||
while read c; do
|
||||
case $c in
|
||||
q|Q) exit 0;;
|
||||
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 ;;
|
||||
*) ask "Invalid answer. Try again: [v/s/r/o] "; continue ;;
|
||||
*) ask "Invalid answer. Try again: [v/s/r/o/q] "; continue ;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user