From 21bf3a448786eac26544c2802abe5a0b30409463 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 13 May 2022 15:48:53 +0200
Subject: update-conf: fix -h usage message

---
 update-conf.in | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'update-conf.in')

diff --git a/update-conf.in b/update-conf.in
index 63cf2b5..72604f2 100644
--- a/update-conf.in
+++ b/update-conf.in
@@ -1,9 +1,9 @@
 #!/bin/sh
 
-PREFIX=@PREFIX@
 VERSION=@VERSION@
-
-. $PREFIX/lib/libalpine.sh
+PREFIX=@PREFIX@
+: ${LIBDIR=$PREFIX/lib}
+. "$LIBDIR/libalpine.sh"
 
 # set up temp dir
 init_tmpdir TMPD
@@ -11,33 +11,32 @@ init_tmpdir TMPD
 LBUCACHE="$TMPD/lbucache"
 
 usage() {
-	cat >&2 <<-__EOF__
+	cat <<-__EOF__
 		$PROGRAM $VERSION
-		Usage: $PROGRAM [-a|--all] [-i|--initd] [-l|--list] [-h|--help]
-		Options:
+		usage: $PROGRAM [-a|--all] [-i|--initd] [-l|--list] [-h|--help]
+
+		options:
 		  -a, --all    Select all updated files
 		  -i, --initd  Use all new init.d scripts
 		  -l, --list   List updated files
 		  -h, --help   Show this help
 
 	__EOF__
+	exit $1
 }
 
-
 is_modified() {
 	[ -f "$LBUCACHE" ] || lbu status -a | awk '{print $2}' > "$LBUCACHE"
 	test -n "$( ( echo "$1" ; cat "$LBUCACHE" ) | sort | uniq -d)"
 }
 
-
 is_initd() {
 	echo "$1" | grep etc/init.d/ > /dev/null
 }
 
 args=$(getopt -o ailh --long all,initd,list,help -n "$PROGRAM" -- "$@")
 if [ $? -ne 0 ]; then
-	usage
-	exit 2
+	usage "1" >&2
 fi
 eval set -- "$args"
 while true; do
@@ -45,9 +44,9 @@ while true; do
 		-a|--all) aflag="-a";;
 		-i|--initd) iflag="-i";;
 		-l|--list) lflag="-l";;
-		-h|--help) usage; exit;;
+		-h|--help) usage 0;;
 		--) shift; break;;
-		*) exit 1;; # getopt error
+		'?') usage "1" >&2;;
 	esac
 	shift
 done
-- 
cgit v1.2.3