index : pacman | |
Archlinux32 fork of pacman | gitolite user |
summaryrefslogtreecommitdiff |
author | Jonathan Frazier <eyeswide@gmail.com> | 2013-07-15 11:00:30 -0400 |
---|---|---|
committer | Allan McRae <allan@archlinux.org> | 2013-07-30 13:00:10 +1000 |
commit | bcde02709120fa8d16d63d5fc797876f5f2fc465 (patch) | |
tree | 066463d9c9e98662709cdd9e2334403298c25ffd /contrib | |
parent | c4d8da47271972a58357bef95efe0b9143714a48 (diff) |
-rw-r--r-- | contrib/pacdiff.sh.in | 22 |
diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index c3c05d2d..eda3878d 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -32,12 +32,22 @@ m4_include(../scripts/library/output_format.sh) m4_include(../scripts/library/term_colors.sh) usage() { - echo "$myname : a simple pacnew/pacorig/pacsave updater" - echo "Usage : $myname [-l]" - echo " -l/--locate makes $myname 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\" $myname" + cat <<EOF +$myname is a simple pacnew/pacorig/pacsave updater. + +Usage: $myname [-l] + +Options: + -l/--locate scan using locate (default: find) + +Enviroment Variables: + DIFFPROG override the merge program: (default: vimdiff) + DIFFSEARCHPATH override the search path. (only when using find) + (default: /etc) + +Example: DIFFPROG=meld DIFFSEARCHPATH="/boot /etc /usr" $myname + +EOF } version() { |