From 3695cd20087fade684e49fc3b2f204b8a80742de Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 1 Dec 2022 17:25:06 +0100
Subject: [PATCH] apkgrel: fix usage and invalid options and add test

---
 apkgrel.in         |  8 ++++----
 tests/apkgrel_test | 13 +++++++++++++
 2 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100755 tests/apkgrel_test

diff --git a/apkgrel.in b/apkgrel.in
index 01a3735..8f13d32 100644
--- a/apkgrel.in
+++ b/apkgrel.in
@@ -73,9 +73,9 @@ do_nothing() {
 }
 
 usage() {
-	cat >&2 <<-__EOF__
+	cat <<-__EOF__
 		$program $program_version - display or bump pkgrel in APKBUILDs
-		Usage: $program [-z|--zero] [-a|--add] [-g|--clean-git] [-s|--set NUM]
+		usage: $program [-z|--zero] [-a|--add] [-g|--clean-git] [-s|--set NUM]
 				[-t|--test] [-f|--force] DIR or APKBUILD...
 		Options:
 		  -z, --zero       Set pkgrel to 0
@@ -98,7 +98,7 @@ only_clean_git=
 args=$(getopt -o zags:tfqh --long zero,add,clean-git,set:,test,force,quiet,help \
 	-n "$program" -- "$@")
 if [ $? -ne 0 ]; then
-	usage
+	usage >&2
 	exit 2
 fi
 eval set -- "$args"
@@ -121,7 +121,7 @@ while true; do
 	shift
 done
 if [ $# -eq 0 ]; then
-	usage
+	usage >&2
 	exit 2
 fi
 
diff --git a/tests/apkgrel_test b/tests/apkgrel_test
new file mode 100755
index 0000000..eaaadfb
--- /dev/null
+++ b/tests/apkgrel_test
@@ -0,0 +1,13 @@
+#!/usr/bin/env atf-sh
+
+. $(atf_get_srcdir)/test_env.sh
+init_tests \
+	apkgrel_usage
+
+export ABUILD_SHAREDIR=$(atf_get_srcdir)/..
+
+apkgrel_usage_body() {
+	atf_check -o match:"usage" apkgrel -h
+	atf_check -s exit:2 -e match:"usage" apkgrel -Z
+}
+