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> --- contrib/pacdiff.sh.in | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/contrib/pacdiff.sh.in b/contrib/pacdiff.sh.in index 4bc4385..830e852 100644 --- a/contrib/pacdiff.sh.in +++ b/contrib/pacdiff.sh.in @@ -31,12 +31,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() { -- 1.8.3.2