From 4757588caf65318c44745b44eee04cf49415fec8 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Fri, 25 Oct 2013 07:26:05 +0000
Subject: [PATCH] functions: rename abuild_ver to program_version

---
 abuild-keygen.in | 4 ++--
 abuild-sign.in   | 4 ++--
 abuild.in        | 6 +++---
 abump.in         | 4 ++--
 apkgrel.in       | 4 ++--
 buildlab.in      | 4 ++--
 checkapk.in      | 4 ++--
 newapkbuild.in   | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/abuild-keygen.in b/abuild-keygen.in
index 017da3d..e33885e 100644
--- a/abuild-keygen.in
+++ b/abuild-keygen.in
@@ -6,7 +6,7 @@
 # Distributed under GPL-2
 #
 
-abuild_ver=@VERSION@
+program_version=@VERSION@
 datadir=@datadir@
 
 if ! [ -f "$datadir/functions.sh" ]; then
@@ -89,7 +89,7 @@ do_keygen() {
 
 usage() {
 	cat >&2 <<__EOF__
-$program $abuild_ver - generate signing keys
+$program $program_version - generate signing keys
 Usage: $program [-a|--append] [-i|--install] [-n]
 Options:
   -a, --append   Set PACKAGER_PRIVKEY=<generated key> in $ABUILD_USERCONF
diff --git a/abuild-sign.in b/abuild-sign.in
index f43fe6b..0c36c96 100644
--- a/abuild-sign.in
+++ b/abuild-sign.in
@@ -6,7 +6,7 @@
 # Distributed under GPL-2
 #
 
-abuild_ver=@VERSION@
+program_version=@VERSION@
 datadir=@datadir@
 
 if ! [ -f "$datadir/functions.sh" ]; then
@@ -44,7 +44,7 @@ do_sign() {
 
 usage() {
 	cat >&2 <<__EOF__
-$program $abuild_ver - sign indexes
+$program $program_version - sign indexes
 Usage: $program [-k PRIVKEY] [-p PUBKEY] INDEXFILE...
 Options:
   -k, --private KEY  The private key to use for signing
diff --git a/abuild.in b/abuild.in
index e0ca62d..a94ff79 100755
--- a/abuild.in
+++ b/abuild.in
@@ -6,7 +6,7 @@
 # Distributed under GPL-2
 #
 
-abuild_ver=@VERSION@
+program_version=@VERSION@
 sysconfdir=@sysconfdir@
 abuildrepo_base=@abuildrepo@
 datadir=@datadir@
@@ -759,7 +759,7 @@ prepare_metafiles() {
 #		parch="noarch"
 #	fi
 
-	echo "# Generated by $(basename $0) $abuild_ver" >"$pkginfo"
+	echo "# Generated by $(basename $0) $program_version" >"$pkginfo"
 	if [ -n "$FAKEROOTKEY" ]; then
 		echo "# using $($FAKEROOT -v)" >> "$pkginfo"
 	fi
@@ -1819,7 +1819,7 @@ snapshot() {
 }
 
 usage() {
-	echo "$program $abuild_ver"
+	echo "$program $program_version"
 	echo "usage: $program [options] [-i PKG] [-P REPODEST] [-p PKGDEST]"
 	echo "              [-s SRCDEST] [cmd] ..."
 	echo "       $program [-c] -n PKGNAME[-PKGVER]"
diff --git a/abump.in b/abump.in
index c16d2c1..f935357 100755
--- a/abump.in
+++ b/abump.in
@@ -6,7 +6,7 @@
 # Distributed under GPL-2
 #
 
-abuild_ver=@VERSION@
+program_version=@VERSION@
 datadir=@datadir@
 
 if ! [ -f "$datadir/functions.sh" ]; then
@@ -81,7 +81,7 @@ fixes #${fixes#\#}
 
 usage() {
 	cat >&2 <<__EOF__
-$program $abuild_ver - 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 ...
 Options:
   -s, --security CVE1,CVE-2,...  Security update
diff --git a/apkgrel.in b/apkgrel.in
index 41da423..3d30515 100644
--- a/apkgrel.in
+++ b/apkgrel.in
@@ -6,7 +6,7 @@
 # Distributed under GPL-2
 #
 
-abuild_ver=@VERSION@
+program_version=@VERSION@
 datadir=@datadir@
 
 if ! [ -f "$datadir/functions.sh" ]; then
@@ -74,7 +74,7 @@ do_nothing() {
 
 usage() {
 	cat >&2 <<__EOF__
-$program $abuild_ver - display or bump pkgrel in APKBUILDs
+$program $program_version - 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
diff --git a/buildlab.in b/buildlab.in
index c555596..7ba4e4c 100755
--- a/buildlab.in
+++ b/buildlab.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-abuild_ver=@VERSION@
+program_version=@VERSION@
 sysconfdir=@sysconfdir@
 abuildrepo=/var/lib/buildlab/result
 datadir=@datadir@
@@ -221,7 +221,7 @@ build_package() {
 }
 
 usage() {
-	echo "buildlab $abuild_ver"
+	echo "buildlab $program_version"
 	echo " "
 	echo "Common options:"
 	echo " "
diff --git a/checkapk.in b/checkapk.in
index 33545b1..079e53b 100644
--- a/checkapk.in
+++ b/checkapk.in
@@ -6,7 +6,7 @@
 # Distributed under GPL-2
 #
 
-abuild_ver=@VERSION@
+program_version=@VERSION@
 datadir=@datadir@
 
 if ! [ -f "$datadir/functions.sh" ]; then
@@ -18,7 +18,7 @@ fi
 
 usage() {
 	cat >&2 <<__EOF__
-$program $abuild_ver - find ABI breakages in package upgrades
+$program $program_version - find ABI breakages in package upgrades
 Usage: $program
 
 Run in the directory of a built package.
diff --git a/newapkbuild.in b/newapkbuild.in
index 927f52c..b79adae 100755
--- a/newapkbuild.in
+++ b/newapkbuild.in
@@ -6,7 +6,7 @@
 # Distributed under GPL-2
 #
 
-abuild_ver=@VERSION@
+program_version=@VERSION@
 datadir=@datadir@
 
 if ! [ -f "$datadir/functions.sh" ]; then
@@ -257,7 +257,7 @@ __EOF__
 
 usage() {
 	cat >&2 <<__EOF__
-$program $abuild_ver - generate a new APKBUILD
+$program $program_version - 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