Commit 1822f3f6 authored by Natanael Copa's avatar Natanael Copa
Browse files

functions: rename prog to program

parent a924d3c1
...@@ -89,8 +89,8 @@ do_keygen() { ...@@ -89,8 +89,8 @@ do_keygen() {
usage() { usage() {
cat >&2 <<__EOF__ cat >&2 <<__EOF__
$prog $abuild_ver - generate signing keys $program $abuild_ver - generate signing keys
Usage: $prog [-a|--append] [-i|--install] [-n] Usage: $program [-a|--append] [-i|--install] [-n]
Options: Options:
-a, --append Set PACKAGER_PRIVKEY=<generated key> in $ABUILD_USERCONF -a, --append Set PACKAGER_PRIVKEY=<generated key> in $ABUILD_USERCONF
-i, --install Install public key into /etc/apk/keys using sudo -i, --install Install public key into /etc/apk/keys using sudo
...@@ -106,7 +106,7 @@ install_pubkey= ...@@ -106,7 +106,7 @@ install_pubkey=
non_interactive= non_interactive=
quiet= quiet=
args=`getopt -o ainqh --long append,install,quiet,help -n "$prog" -- "$@"` args=`getopt -o ainqh --long append,install,quiet,help -n "$program" -- "$@"`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
usage usage
exit 2 exit 2
......
...@@ -44,8 +44,8 @@ do_sign() { ...@@ -44,8 +44,8 @@ do_sign() {
usage() { usage() {
cat >&2 <<__EOF__ cat >&2 <<__EOF__
$prog $abuild_ver - sign indexes $program $abuild_ver - sign indexes
Usage: $prog [-k PRIVKEY] [-p PUBKEY] INDEXFILE... Usage: $program [-k PRIVKEY] [-p PUBKEY] INDEXFILE...
Options: Options:
-k, --private KEY The private key to use for signing -k, --private KEY The private key to use for signing
-p, --public KEY The name of public key. apk add will look for /etc/apk/keys/KEY -p, --public KEY The name of public key. apk add will look for /etc/apk/keys/KEY
...@@ -59,7 +59,7 @@ privkey="$PACKAGER_PRIVKEY" ...@@ -59,7 +59,7 @@ privkey="$PACKAGER_PRIVKEY"
pubkey= pubkey=
quiet= quiet=
args=`getopt -o k:p:qh --long private:,public:,quiet,help -n "$prog" -- "$@"` args=`getopt -o k:p:qh --long private:,public:,quiet,help -n "$program" -- "$@"`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
usage usage
exit 2 exit 2
...@@ -88,7 +88,7 @@ Then you can either: ...@@ -88,7 +88,7 @@ Then you can either:
* set the PACKAGER_PRIVKEY in $ABUILD_USERCONF * set the PACKAGER_PRIVKEY in $ABUILD_USERCONF
('abuild-keygen -a' does this for you) ('abuild-keygen -a' does this for you)
* set the PACKAGER_PRIVKEY in $ABUILD_CONF * set the PACKAGER_PRIVKEY in $ABUILD_CONF
* specify the key with the -k option to $prog * specify the key with the -k option to $program
__EOF__ __EOF__
exit 1 exit 1
......
...@@ -1819,10 +1819,10 @@ snapshot() { ...@@ -1819,10 +1819,10 @@ snapshot() {
} }
usage() { usage() {
echo "$prog $abuild_ver" echo "$program $abuild_ver"
echo "usage: $prog [options] [-i PKG] [-P REPODEST] [-p PKGDEST]" echo "usage: $program [options] [-i PKG] [-P REPODEST] [-p PKGDEST]"
echo " [-s SRCDEST] [cmd] ..." echo " [-s SRCDEST] [cmd] ..."
echo " $prog [-c] -n PKGNAME[-PKGVER]" echo " $program [-c] -n PKGNAME[-PKGVER]"
echo "Options:" echo "Options:"
echo " -c Enable colored output" echo " -c Enable colored output"
echo " -d Disable dependency checking" echo " -d Disable dependency checking"
......
...@@ -81,8 +81,8 @@ fixes #${fixes#\#} ...@@ -81,8 +81,8 @@ fixes #${fixes#\#}
usage() { usage() {
cat >&2 <<__EOF__ cat >&2 <<__EOF__
$prog $abuild_ver - bump pkgver in APKBUILDs $program $abuild_ver - bump pkgver in APKBUILDs
Usage: $prog [-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:
-s, --security CVE1,CVE-2,... Security update -s, --security CVE1,CVE-2,... Security update
-f, --fixes ISSUE Fixes ISSUE -f, --fixes ISSUE Fixes ISSUE
...@@ -102,7 +102,8 @@ fixes= ...@@ -102,7 +102,8 @@ fixes=
[ -n "$APORTSDIR" ] || error "can't locate \$APORTSDIR" [ -n "$APORTSDIR" ] || error "can't locate \$APORTSDIR"
git rev-parse 2>/dev/null || die "not in a git tree" git rev-parse 2>/dev/null || die "not in a git tree"
args=`getopt -o f:s:Rkqh --long fixes:,security:,recursive,keep,quiet,help -n "$prog" -- "$@"` args=`getopt -o f:s:Rkqh --long fixes:,security:,recursive,keep,quiet,help \
-n "$program" -- "$@"`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
usage usage
exit 2 exit 2
......
...@@ -74,8 +74,8 @@ do_nothing() { ...@@ -74,8 +74,8 @@ do_nothing() {
usage() { usage() {
cat >&2 <<__EOF__ cat >&2 <<__EOF__
$prog $abuild_ver - display or bump pkgrel in APKBUILDs $program $abuild_ver - display or bump pkgrel in APKBUILDs
Usage: $prog [-z|--zero] [-a|--add] [-g|--clean-git] [-s|--set NUM] [-t|--test] [-f|--force] DIR or APKBUILD... Usage: $program [-z|--zero] [-a|--add] [-g|--clean-git] [-s|--set NUM] [-t|--test] [-f|--force] DIR or APKBUILD...
Options: Options:
-z, --zero Set pkgrel to 0 -z, --zero Set pkgrel to 0
-a, --add Add 1 to current pkgrel -a, --add Add 1 to current pkgrel
...@@ -93,7 +93,8 @@ force= ...@@ -93,7 +93,8 @@ force=
setto= setto=
only_clean_git= only_clean_git=
args=`getopt -o zags:tfqh --long zero,add,clean-git,set:,test,force,quiet,help -n "$prog" -- "$@"` args=`getopt -o zags:tfqh --long zero,add,clean-git,set:,test,force,quiet,help \
-n "$program" -- "$@"`
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
usage usage
exit 2 exit 2
......
...@@ -18,8 +18,8 @@ fi ...@@ -18,8 +18,8 @@ fi
usage() { usage() {
cat >&2 <<__EOF__ cat >&2 <<__EOF__
$prog $abuild_ver - find ABI breakages in package upgrades $program $abuild_ver - find ABI breakages in package upgrades
Usage: $prog Usage: $program
Run in the directory of a built package. Run in the directory of a built package.
......
# /usr/share/abuild/functions.sh # /usr/share/abuild/functions.sh
sysconfdir=@sysconfdir@ sysconfdir=@sysconfdir@
prog=${0##*/} program=${0##*/}
hostspec_to_arch() { hostspec_to_arch() {
case "$1" in case "$1" in
......
...@@ -257,8 +257,8 @@ __EOF__ ...@@ -257,8 +257,8 @@ __EOF__
usage() { usage() {
cat >&2 <<__EOF__ cat >&2 <<__EOF__
$prog $abuild_ver - generate a new APKBUILD $program $abuild_ver - generate a new APKBUILD
Usage: $prog [-cfh] [-d DESC] [-l LICENSE] [-n NAME] [-u URL] PKGNAME[-PKGVER]|SRCURL Usage: $program [-cfh] [-d DESC] [-l LICENSE] [-n NAME] [-u URL] PKGNAME[-PKGVER]|SRCURL
Options: Options:
-n Set package name to NAME -n Set package name to NAME
-d Set package description (pkgdesc) to DESC -d Set package description (pkgdesc) to DESC
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment