diff options
| author | Dubiousjim <dubiousjim@gmail.com> | 2013-07-05 00:21:16 -0400 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-07-09 06:44:01 +0000 |
| commit | db1314ac55df59e1fbecdae280cf2b4c1784dd5a (patch) | |
| tree | f94dc44cf791559b3291a45d8470bba3f2423610 /abuild-keygen.in | |
| parent | 144ee3f113ffc73188c6cdc1682b908f6e28cba6 (diff) | |
| download | abuild-db1314ac55df59e1fbecdae280cf2b4c1784dd5a.tar.gz abuild-db1314ac55df59e1fbecdae280cf2b4c1784dd5a.tar.bz2 abuild-db1314ac55df59e1fbecdae280cf2b4c1784dd5a.tar.xz abuild-db1314ac55df59e1fbecdae280cf2b4c1784dd5a.zip | |
various: move conf-loading and i/o to functions
Diffstat (limited to 'abuild-keygen.in')
| -rw-r--r-- | abuild-keygen.in | 20 |
1 files changed, 6 insertions, 14 deletions
diff --git a/abuild-keygen.in b/abuild-keygen.in index 3cf5531..9b748d3 100644 --- a/abuild-keygen.in +++ b/abuild-keygen.in @@ -7,17 +7,14 @@ # 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"} +if ! [ -f "$datadir/functions.sh" ]; then + echo "$datadir/functions.sh: not found" >&2 + exit 1 +fi +. "$datadir/functions.sh" -# echo message unless quite mode -msg() { - [ -n "$quiet" ] && return 0 - echo "$@" -} # ask for privkey unless non-interactive mode # returns value in global $privkey @@ -107,11 +104,6 @@ usage() { exit 1 } -# read config -[ -f "$abuild_conf" ] && . "$abuild_conf" - -# read user config if exists -[ -f "$abuild_userconf" ] && . "$abuild_userconf" while getopts "ahinq" opt; do case $opt in |