diff options
| author | Jonathan Frazier <eyeswide@gmail.com> | 2013-07-11 19:03:36 +0200 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2013-07-22 05:28:40 +0200 |
| commit | 9108bfe08093e0c64a1879c4d74df2ad2c26302c (patch) | |
| tree | a0231b7290e0065bc002d6bd2cad1ab94ede87b0 | |
| parent | bcbb6a56a16bc875ec7f28ce832ccb14787cf445 (diff) | |
| download | pacman-9108bfe08093e0c64a1879c4d74df2ad2c26302c.tar.gz pacman-9108bfe08093e0c64a1879c4d74df2ad2c26302c.tar.xz | |
pacdiff: Add quit to found pacnew options
Signed-off-by: Jonathan Frazier <eyeswide@gmail.com>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | contrib/pacdiff.sh.in | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 47779d6b..16365d3e 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -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 |