various: move conf-loading and i/o to functions

1 files changed, 13 insertions, 10 deletions

diff --git a/abump.in b/abump.in
index 897b50e..32ff4af 100755
--- a/abump.in
+++ b/abump.in
@@ -6,12 +6,15 @@
 # Distributed under GPL-2
 #
 
-program=${0##*/}
+abuild_ver=@VERSION@
+datadir=@datadir@
 
-die() {
-	echo "$@" >&2
+if ! [ -f "$datadir/functions.sh" ]; then
+	echo "$datadir/functions.sh: not found" >&2
 	exit 1
-}
+fi
+. "$datadir/functions.sh"
+
 
 # version bump a pkg
 
@@ -31,14 +34,14 @@ do_bump() {
 		cve=" ($cvelist)"
 	fi
 
-	msg="$section/$pkgname: $upgrade to ${pkgver}${cve}"
+	message="$section/$pkgname: $upgrade to ${pkgver}${cve}"
 	if [ -n "$fixes" ]; then
-		msg="$msg
+		message="$message
 
 fixes #${fixes#\#}
 "
 	fi
-	echo "$msg"
+	echo "$message"
 
 	( . ./APKBUILD; type package | grep -q function ) || die "package() missing"
 
@@ -49,12 +52,12 @@ fixes #${fixes#\#}
 	abuild $abuild_opts checksum all || exit 1
 
 	git add APKBUILD
-	git commit -m"$msg"
+	git commit -m"$message"
 }
 
 usage() {
-	echo "$program - utility to bump pkgver in APKBUILDs"
-	echo "usage: $program [-hR] [-s CVE-1,CVE-2,...] [-f ISSUE]"
+	echo "$prog - utility to bump pkgver in APKBUILDs"
+	echo "usage: $prog [-hR] [-s CVE-1,CVE-2,...] [-f ISSUE]"
 	echo ""
 	echo "  -h  show this help"
 	echo "  -R  run abuild with -R for recursive building"