functions: rename prog to program

8 files changed, 23 insertions, 21 deletions

diff --git a/abuild-keygen.in b/abuild-keygen.in
index c02ad82..017da3d 100644
--- a/abuild-keygen.in
+++ b/abuild-keygen.in
@@ -89,8 +89,8 @@ do_keygen() {
 
 usage() {
 	cat >&2 <<__EOF__
-$prog $abuild_ver - generate signing keys
-Usage: $prog [-a|--append] [-i|--install] [-n]
+$program $abuild_ver - generate signing keys
+Usage: $program [-a|--append] [-i|--install] [-n]
 Options:
   -a, --append   Set PACKAGER_PRIVKEY=<generated key> in $ABUILD_USERCONF
   -i, --install  Install public key into /etc/apk/keys using sudo
@@ -106,7 +106,7 @@ install_pubkey=
 non_interactive=
 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
 	usage
 	exit 2
diff --git a/abuild-sign.in b/abuild-sign.in
index f00c0a1..f43fe6b 100644
--- a/abuild-sign.in
+++ b/abuild-sign.in
@@ -44,8 +44,8 @@ do_sign() {
 
 usage() {
 	cat >&2 <<__EOF__
-$prog $abuild_ver - sign indexes
-Usage: $prog [-k PRIVKEY] [-p PUBKEY] INDEXFILE...
+$program $abuild_ver - sign indexes
+Usage: $program [-k PRIVKEY] [-p PUBKEY] INDEXFILE...
 Options:
   -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
@@ -59,7 +59,7 @@ privkey="$PACKAGER_PRIVKEY"
 pubkey=
 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
 	usage
 	exit 2
@@ -88,7 +88,7 @@ Then you can either:
   * set the PACKAGER_PRIVKEY in $ABUILD_USERCONF
     ('abuild-keygen -a' does this for you)
   * 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__
 	exit 1
diff --git a/abuild.in b/abuild.in
index f118c62..e0ca62d 100755
--- a/abuild.in
+++ b/abuild.in
@@ -1819,10 +1819,10 @@ snapshot() {
 }
 
 usage() {
-	echo "$prog $abuild_ver"
-	echo "usage: $prog [options] [-i PKG] [-P REPODEST] [-p PKGDEST]"
+	echo "$program $abuild_ver"
+	echo "usage: $program [options] [-i PKG] [-P REPODEST] [-p PKGDEST]"
 	echo "              [-s SRCDEST] [cmd] ..."
-	echo "       $prog [-c] -n PKGNAME[-PKGVER]"
+	echo "       $program [-c] -n PKGNAME[-PKGVER]"
 	echo "Options:"
 	echo " -c  Enable colored output"
 	echo " -d  Disable dependency checking"
diff --git a/abump.in b/abump.in
index eef57d5..c16d2c1 100755
--- a/abump.in
+++ b/abump.in
@@ -81,8 +81,8 @@ fixes #${fixes#\#}
 
 usage() {
 	cat >&2 <<__EOF__
-$prog $abuild_ver - bump pkgver in APKBUILDs
-Usage: $prog [-s CVE-1,CVE-2,...] [-f ISSUE] [-R|--recursive] [-k|--keep] PKGNAME-1.2.3 ...
+$program $abuild_ver - bump pkgver in APKBUILDs
+Usage: $program [-s CVE-1,CVE-2,...] [-f ISSUE] [-R|--recursive] [-k|--keep] PKGNAME-1.2.3 ...
 Options:
   -s, --security CVE1,CVE-2,...  Security update
   -f, --fixes ISSUE              Fixes ISSUE
@@ -102,7 +102,8 @@ 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: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
 	usage
 	exit 2
diff --git a/apkgrel.in b/apkgrel.in
index 94acd55..41da423 100644
--- a/apkgrel.in
+++ b/apkgrel.in
@@ -74,8 +74,8 @@ do_nothing() {
 
 usage() {
 	cat >&2 <<__EOF__
-$prog $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...
+$program $abuild_ver - display or bump pkgrel in APKBUILDs
+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
   -a, --add        Add 1 to current pkgrel
@@ -93,7 +93,8 @@ force=
 setto=
 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
 	usage
 	exit 2
diff --git a/checkapk.in b/checkapk.in
index 98da12a..33545b1 100644
--- a/checkapk.in
+++ b/checkapk.in
@@ -18,8 +18,8 @@ fi
 
 usage() {
 	cat >&2 <<__EOF__
-$prog $abuild_ver - find ABI breakages in package upgrades
-Usage: $prog
+$program $abuild_ver - find ABI breakages in package upgrades
+Usage: $program
 
 Run in the directory of a built package.
 
diff --git a/functions.sh.in b/functions.sh.in
index 7631310..719b354 100755
--- a/functions.sh.in
+++ b/functions.sh.in
@@ -1,7 +1,7 @@
 # /usr/share/abuild/functions.sh
 
 sysconfdir=@sysconfdir@
-prog=${0##*/}
+program=${0##*/}
 
 hostspec_to_arch() {
 	case "$1" in
diff --git a/newapkbuild.in b/newapkbuild.in
index 6a32e08..927f52c 100755
--- a/newapkbuild.in
+++ b/newapkbuild.in
@@ -257,8 +257,8 @@ __EOF__
 
 usage() {
 	cat >&2 <<__EOF__
-$prog $abuild_ver - generate a new APKBUILD
-Usage: $prog [-cfh] [-d DESC] [-l LICENSE] [-n NAME] [-u URL] PKGNAME[-PKGVER]|SRCURL
+$program $abuild_ver - generate a new APKBUILD
+Usage: $program [-cfh] [-d DESC] [-l LICENSE] [-n NAME] [-u URL] PKGNAME[-PKGVER]|SRCURL
 Options:
   -n  Set package name to NAME
   -d  Set package description (pkgdesc) to DESC