abump: fix help/usage
- exit with success with -h is specified and use stdout
This commit is contained in:
parent
df0eece116
commit
fe74a8a760
14
abump.in
14
abump.in
|
@ -89,7 +89,7 @@ fixes #${fixes#\#}
|
||||||
}
|
}
|
||||||
|
|
||||||
usage() {
|
usage() {
|
||||||
cat >&2 <<-__EOF__
|
cat <<-__EOF__
|
||||||
$program $program_version - bump pkgver in APKBUILDs
|
$program $program_version - bump pkgver in APKBUILDs
|
||||||
Usage: $program [-s CVE-1,CVE-2,...] [-f ISSUE] [-R|--recursive] [-k|--keep] PKGNAME-1.2.3 ...
|
Usage: $program [-s CVE-1,CVE-2,...] [-f ISSUE] [-R|--recursive] [-k|--keep] PKGNAME-1.2.3 ...
|
||||||
Options:
|
Options:
|
||||||
|
@ -106,13 +106,10 @@ keep=
|
||||||
cvelist=
|
cvelist=
|
||||||
fixes=
|
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 \
|
args=$(getopt -o f:s:kqh --long fixes:,security:,keep,quiet,help \
|
||||||
-n "$program" -- "$@")
|
-n "$program" -- "$@")
|
||||||
if [ $? -ne 0 ]; then
|
if [ $? -ne 0 ]; then
|
||||||
usage
|
usage >&2
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
fi
|
||||||
eval set -- "$args"
|
eval set -- "$args"
|
||||||
|
@ -122,17 +119,20 @@ while true; do
|
||||||
-f|--fixes) fixes="$2"; shift;;
|
-f|--fixes) fixes="$2"; shift;;
|
||||||
-k|--keep) keep="-k";;
|
-k|--keep) keep="-k";;
|
||||||
-q|--quiet) quiet=1;; # suppresses msg
|
-q|--quiet) quiet=1;; # suppresses msg
|
||||||
-h|--help) usage; exit;;
|
-h|--help) usage; exit 0;;
|
||||||
--) shift; break;;
|
--) shift; break;;
|
||||||
*) exit 1;; # getopt error
|
*) exit 1;; # getopt error
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
if [ $# -eq 0 ]; then
|
if [ $# -eq 0 ]; then
|
||||||
usage
|
usage >&2
|
||||||
exit 2
|
exit 2
|
||||||
fi
|
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"
|
abuild_opts="${ABUILD_OPTS- -r} $keep"
|
||||||
|
|
||||||
do_bump "$@"
|
do_bump "$@"
|
||||||
|
|
Loading…
Reference in New Issue