index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Vasiliy Korchagin <vasiliy.korchagin@gmail.com> | 2013-11-18 13:01:38 +1000 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2013-12-15 20:09:37 +1000 |
commit | ae2c9bba5a0de58454814c5fa438cf1db52707ae (patch) | |
tree | bccd0160a7d87c200ecc53855772dcef675d4645 | |
parent | af2c0a15371058ba93d6bb423b3fe90e45380d7a (diff) |
-rw-r--r-- | contrib/pacdiff.sh.in | 3 |
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 |