various: use long options, rework usages

1 files changed, 18 insertions, 17 deletions

diff --git a/newapkbuild.in b/newapkbuild.in
index 0f95f19..1b65815 100755
--- a/newapkbuild.in
+++ b/newapkbuild.in
@@ -253,22 +253,23 @@ __EOF__
 }
 
 usage() {
-	echo "$prog $abuild_ver"
-	echo "usage: $prog [-cfh] [-d DESC] [-l LICENSE] [-n NAME] [-u URL] PKGNAME[-PKGVER]|SRCURL"
-	echo "Options:"
-	echo " -a  Create autotools (use ./configure ...)"
-	echo " -c  Copy a sample init.d, conf.d, and install script to new directory"
-	echo " -d  Set package description (pkgdesc) to DESC"
-	echo " -f  Force even if directory already exist"
-	echo " -h  Show this help"
-	echo " -l  Set package license to LICENSE"
-	echo " -n  Set package name to NAME"
-	echo " -p  Create perl package (Assume Makefile.PL is there)"
-	echo " -y  Create python package (Assume setup.py is there)"
-	echo " -u  Set package URL"
-	echo " -s  Use sourceforge source URL"
-	echo ""
-	exit 0
+	cat >&2 <<__EOF__
+$prog $abuild_ver - generate a new APKBUILD
+Usage: $prog [-cfh] [-d DESC] [-l LICENSE] [-n NAME] [-u URL] PKGNAME[-PKGVER]|SRCURL
+Options:
+  -n  Set package name to NAME
+  -d  Set package description (pkgdesc) to DESC
+  -l  Set package license to LICENSE
+  -u  Set package URL
+  -a  Create autotools (use ./configure ...)
+  -p  Create perl package (Assume Makefile.PL is there)
+  -y  Create python package (Assume setup.py is there)
+  -s  Use sourceforge source URL
+  -c  Copy a sample init.d, conf.d, and install script to new directory
+  -f  Force even if directory already exist
+  -h  Show this help
+
+__EOF__
 }
 
 while getopts "acd:fhl:n:pyu:s" opt; do
@@ -277,7 +278,7 @@ while getopts "acd:fhl:n:pyu:s" opt; do
 		'c') cpinitd=1;;
 		'd') pkgdesc="$OPTARG";;
 		'f') force=1;;
-		'h') usage;;
+		'h') usage; exit;;
 		'l') license="$OPTARG";;
 		'n') pkgname="$OPTARG";;
 		'p') buildtype="perl";;