From db1314ac55df59e1fbecdae280cf2b4c1784dd5a Mon Sep 17 00:00:00 2001
From: Dubiousjim <dubiousjim@gmail.com>
Date: Fri, 5 Jul 2013 00:21:16 -0400
Subject: various: move conf-loading and i/o to functions

---
 abuild-sign.in | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'abuild-sign.in')

diff --git a/abuild-sign.in b/abuild-sign.in
index 73aabc7..3260e53 100644
--- a/abuild-sign.in
+++ b/abuild-sign.in
@@ -7,16 +7,13 @@
 #
 
 abuild_ver=@VERSION@
-sysconfdir=@sysconfdir@
+datadir=@datadir@
 
-abuild_conf=${ABUILD_CONF:-"$sysconfdir/abuild.conf"}
-abuild_home=${ABUILD_USERDIR:-"$HOME/.abuild"}
-abuild_userconf=${ABUILD_USERCONF:-"$abuild_home/abuild.conf"}
-
-die() {
-	echo "$@" >&2
+if ! [ -f "$datadir/functions.sh" ]; then
+	echo "$datadir/functions.sh: not found" >&2
 	exit 1
-}
+fi
+. "$datadir/functions.sh"
 
 do_sign() {
 	# we are actually only interested in the name, not the file itself
@@ -52,12 +49,6 @@ usage() {
 	exit 1
 }
 
-# read config
-[ -f "$abuild_conf" ] && . "$abuild_conf"
-
-# read user config if exists
-[ -f "$abuild_userconf" ] && . "$abuild_userconf"
-
 privkey="$PACKAGER_PRIVKEY"
 
 while getopts "hk:p:q" opt; do
-- 
cgit v1.2.3