Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVasiliy Korchagin <vasiliy.korchagin@gmail.com>2013-11-18 13:01:38 +1000
committerAllan McRae <allan@archlinux.org>2013-12-15 20:09:37 +1000
commitae2c9bba5a0de58454814c5fa438cf1db52707ae (patch)
treebccd0160a7d87c200ecc53855772dcef675d4645
parentaf2c0a15371058ba93d6bb423b3fe90e45380d7a (diff)
pacdiff: do not remove pacfile after viewing
Automatically removing the file after viewing is not good if on viewing you decide to deal with it later. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--contrib/pacdiff.sh.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in
index 1bad0e4b..735b2f55 100644
--- a/contrib/pacdiff.sh.in
+++ b/contrib/pacdiff.sh.in
@@ -178,7 +178,8 @@ while IFS= read -u 3 -r -d '' pacfile; do
o|O) mv -v "$pacfile" "$file"; break ;;
v|V)
$diffprog "$pacfile" "$file"
- rm -iv "$pacfile"; break ;;
+ ask "(V)iew, (S)kip, (R)emove %s, (O)verwrite with %s, (Q)uit: [v/s/r/o/q] " "$file_type" "$file_type";
+ continue ;;
s|S) break ;;
*) ask "Invalid answer. Try again: [v/s/r/o/q] "; continue ;;
esac