Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/contrib/pacdiff.sh.in
diff options
context:
space:
mode:
authorJason St. John <jstjohn@purdue.edu>2013-11-08 02:53:33 -0500
committerAllan McRae <allan@archlinux.org>2013-11-15 11:02:27 +1000
commita15fd48016014249a13db7a437b5e4f5937f6158 (patch)
treeeecd9c3717fcb05d58983ce89f4d3778502f0cc4 /contrib/pacdiff.sh.in
parent7bfaa358ea45c5d527a382bb5fef734b3134bd6f (diff)
Improve --help switch output for pacman contrib and pacman scripts
Unify the formatting of the --help switch for pacman utils, if it exists. All of the pacman utils will now output help text using the following format: util-name (pacman) v<pacman version> one line description of util's purpose Usage: util-name [options] -b, --bar whatever --bar does -f, --foo whatever --foo does -h, --help display this help message Reported-by: Karol Błażewicz <karol.blazewicz at gmail.com> Signed-off-by: Jason St. John <jstjohn@purdue.edu>
Diffstat (limited to 'contrib/pacdiff.sh.in')
-rw-r--r--contrib/pacdiff.sh.in8
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in
index 6e70feeb..1bad0e4b 100644
--- a/contrib/pacdiff.sh.in
+++ b/contrib/pacdiff.sh.in
@@ -33,20 +33,22 @@ m4_include(../scripts/library/output_format.sh)
usage() {
cat <<EOF
-$myname is a simple pacnew/pacorig/pacsave updater.
+${myname} (pacman) v${myver}
+
+A simple program to merge or remove pacnew/pacorig/pacsave files.
Usage: $myname [-l | -f | -p] [--nocolor]
Search Options: select one, default: pacmandb
-l/--locate scan using locate
-f/--find scan using find
- -p/--pacmandb scan active config files from pacman db
+ -p/--pacmandb scan active config files from pacman database
General Options:
-o/--output print files instead of merging them
--nocolor remove colors from output
-Enviroment Variables:
+Environment Variables:
DIFFPROG override the merge program: (default: vimdiff)
DIFFSEARCHPATH override the search path. (only when using find)
(default: /etc)