From fe74a8a760caf8cf3aa41a0acd1ab5b5cb3d5c66 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Mon, 20 Jun 2022 16:51:43 +0200
Subject: [PATCH] abump: fix help/usage

- exit with success with -h is specified and use stdout
---
 abump.in | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/abump.in b/abump.in
index 48d1eed..6cb6c87 100644
--- a/abump.in
+++ b/abump.in
@@ -89,7 +89,7 @@ fixes #${fixes#\#}
 }
 
 usage() {
-	cat >&2 <<-__EOF__
+	cat <<-__EOF__
 		$program $program_version - bump pkgver in APKBUILDs
 		Usage: $program [-s CVE-1,CVE-2,...] [-f ISSUE] [-R|--recursive] [-k|--keep] PKGNAME-1.2.3 ...
 		Options:
@@ -106,13 +106,10 @@ keep=
 cvelist=
 fixes=
 
-[ -n "$APORTSDIR" ] || error "can't locate \$APORTSDIR"
-git rev-parse 2>/dev/null || die "not in a git tree"
-
 args=$(getopt -o f:s:kqh --long fixes:,security:,keep,quiet,help \
 	-n "$program" -- "$@")
 if [ $? -ne 0 ]; then
-	usage
+	usage >&2
 	exit 2
 fi
 eval set -- "$args"
@@ -122,17 +119,20 @@ while true; do
 		-f|--fixes) fixes="$2"; shift;;
 		-k|--keep) keep="-k";;
 		-q|--quiet) quiet=1;; # suppresses msg
-		-h|--help) usage; exit;;
+		-h|--help) usage; exit 0;;
 		--) shift; break;;
 		*) exit 1;; # getopt error
 	esac
 	shift
 done
 if [ $# -eq 0 ]; then
-	usage
+	usage >&2
 	exit 2
 fi
 
+[ -n "$APORTSDIR" ] || error "can't locate \$APORTSDIR"
+git rev-parse 2>/dev/null || die "not in a git tree"
+
 abuild_opts="${ABUILD_OPTS- -r} $keep"
 
 do_bump "$@"