diff options
| author | Heiko Baums <heiko@baums-on-web.de> | 2009-10-21 23:46:47 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2009-10-24 16:55:50 +0200 |
| commit | 6ed7d001f6783907d762514dab0741f98d22d715 (patch) | |
| tree | 684543d7183e75046439e5be8267af9217d3a01a | |
| parent | c6095e103240589895ebdd4b3789c960cb897ed5 (diff) | |
| download | pacman-6ed7d001f6783907d762514dab0741f98d22d715.tar.gz pacman-6ed7d001f6783907d762514dab0741f98d22d715.tar.xz | |
pacdiff : add diffsearchpath option
Xav: added doc
Signed-off-by: Xavier Chantry <shiningxc@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rwxr-xr-x | contrib/pacdiff | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/contrib/pacdiff b/contrib/pacdiff index 5138d91c..3f26f381 100755 --- a/contrib/pacdiff +++ b/contrib/pacdiff @@ -18,19 +18,23 @@ # diffprog=${DIFFPROG:-vimdiff} +diffsearchpath=${DIFFSEARCHPATH:-/etc} locate=0 usage() { echo "pacdiff : a simple pacnew/pacorig/pacsave updater" echo "Usage : pacdiff [-l]" - echo "The -l/--locate flag makes pacdiff use locate rather than find" + echo " -l/--locate makes pacdiff use locate rather than find" + echo " DIFFPROG variable allows to override the default vimdiff" + echo " DIFFSEARCHPATH allows to override the default /etc path" + echo "Example : DIFFPROG=meld DIFFSEARCHPATH=\"/boot /etc /usr\" pacdiff" } cmd() { if [ $locate -eq 1 ]; then locate -0 -e -b \*.pacnew \*.pacorig \*.pacsave else - find /etc/ \( -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave \) -print0 + find $diffsearchpath \( -name \*.pacnew -o -name \*.pacorig -o -name \*.pacsave \) -print0 fi } |