sbopkglint: get rid of short help (--help now same as --doc).

1 files changed, 3 insertions, 43 deletions

diff --git a/sbopkglint b/sbopkglint
index 575c0af..e54daf2 100755
--- a/sbopkglint
+++ b/sbopkglint
@@ -12,7 +12,7 @@ sbopkglint - check Slackware binary packages for common errrors.
 
 =head1 SYNOPSIS
 
-B<sbopkglint> [-k] [-i] [-s] [I<package.t?z> I<...>]
+B<sbopkglint> [-k] [-i] [-s] [-c | --color] [-m | --mono] [I<package.t?z> I<...>]
 
 =head1 DESCRIPTION
 
@@ -73,11 +73,7 @@ color only when B<stdout> is a terminal.
 
 Do not colorize the output, even if B<stdout> is a terminal.
 
-=item B<--help>
-
-Show the short built-in help.
-
-=item B<--doc>
+=item B<--doc>, B<--help>
 
 View this documentation using perldoc(1), which generally uses your
 pager (e.g. less(1) or more(1)) to display it.
@@ -383,52 +379,16 @@ EOF
 
 SELF="$( basename $0 )"
 
-usage() {
-	cat 1>&2 <<EOF
-$SELF v$VER - check SBo binary packages for various problems
-
-Usage:
-  $0 [-k] [-i] [-s] [-c | -m] [/path/to/package-file] [...]
-  $0 --doc | --man | --version
-
-Options:
--k           Keep (don't delete) the package install directory at exit.
--i           Do not check for INSTALL in the doc dir.
--s           Do not check for \$PRGNAM.SlackBuild in doc dir.
--c, --color  Use color, even if stdout is not a tty.
--m, --mono   Do not use color, even if stdout is a tty.
---help       Show short help message (you're looking at it now).
---doc        See the full documentation in your pager.
---man        Convert the full documentation to a man page, on stdout.
---version    Print the sbopkglint version number on stdout and exit.
-
-With no package arguments, it looks for a SlackBuild in the current
-directory, extracts the PRINT_PACKAGE_NAME information, and tries to
-find a package in \$OUTPUT (/tmp by default).
-
-With arguments, it checks the given packages. These must be supported
-Slackware package files (.tgz, .txz, .tlz, etc).
-
-Diagnostics will be logged to stdout and stderr. Exit status will
-be 0 if all tests passed, non-zero otherwise.
-
-This script must run as root. If you run it as a normal user, it tries
-to re-execute itself via sudo(8) before installing any packages. If
-you dislike sudo, you can always run it as root.
-EOF
-}
-
 COLOR=${COLOR:-auto}
 
 while true; do
 	case "$1" in
 		--version) echo $VER ; exit 0 ;;
-		--doc) exec perldoc "$0" ;;
+		-h*|--h*|--doc) exec perldoc "$0" ;;
 		--man) exec pod2man --stderr -s1 -csbo-maintainer-tools -r$VER "$0" ;;
 		-k) KEEP=1 ; shift ;;
 		-i) INSTALL_DOCS_OK=1 ; shift;;
 		-s) SLACKBUILD_MISSING_OK=1 ; shift;;
-		-h*|--h*) usage; exit 0 ;;
 		-c|--color) COLOR=yes ; shift ;;
 		-m|--mono*) COLOR=no  ; shift ;;
 		-*) echo "$SELF: invalid option '$1', try '$SELF --help'" ; exit 1 ;;