bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pacdiff: Add quit to found pacnew options

Browse source 
Signed-off-by: Jonathan Frazier <eyeswide@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
This commit is contained in:
Jonathan Frazier 2013-07-11 13:03:36 -04:00 • committed by Allan McRae
parent bcbb6a56a1
commit 9108bfe080
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/pacdiff.sh.in
View file

@ -82,16 +82,17 @@ while IFS= read -u 3 -r -d '' pacfile; do
msg2 "Files are identical, removing..." msg2 "Files are identical, removing..."
rm -v "$pacfile" rm -v "$pacfile"
else 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 while read c; do
case $c in case $c in
q|Q) exit 0;;
r|R) rm -v "$pacfile"; break ;; r|R) rm -v "$pacfile"; break ;;
o|O) mv -v "$pacfile" "$file"; 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 ;;
*) ask "Invalid answer. Try again: [v/s/r/o] "; continue ;; *) ask "Invalid answer. Try again: [v/s/r/o/q] "; continue ;;
esac esac
done done
fi fi