summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Frazier <eyeswide@gmail.com>2013-07-15 11:00:30 -0400
committerAllan McRae <allan@archlinux.org>2013-07-30 13:00:10 +1000
commitbcde02709120fa8d16d63d5fc797876f5f2fc465 (patch)
tree066463d9c9e98662709cdd9e2334403298c25ffd
parentc4d8da47271972a58357bef95efe0b9143714a48 (diff)
downloadpacman-bcde02709120fa8d16d63d5fc797876f5f2fc465.tar.xz
pacdiff: clean up and reword --help
Clean up and reword --help get rid of all the echos to make it easier to read in source. Signed-off-by: Jonathan Frazier <eyeswide@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--contrib/pacdiff.sh.in22
1 files changed, 16 insertions, 6 deletions
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() {