diff options
| author | Andrew Fyfe <andrew@neptune-one.net> | 2007-04-02 00:55:01 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2007-04-01 21:52:28 -0400 |
| commit | 9c9e18ef32c0cf3fe33ed251d28c70651bb85f65 (patch) | |
| tree | e5f0dced39295c5e8a22b0a170d82b8d2bba0af1 /scripts/gensync | |
| parent | ea3a182dbfed4975eb5f2950b1c66bef53707f9a (diff) | |
| download | pacman-9c9e18ef32c0cf3fe33ed251d28c70651bb85f65.tar.xz | |
Tidy up usage of makepkg.conf
Moved the following variables into /etc/makepkg.conf
* BUILDSCRIPT
* PKGEXT
* DB_COMPRESSION
* DB_CHECKSUMS
Cleaned up sourcing of /etc/makepkg.conf in scripts and source
~/.makepkg.conf if it exists.
Signed-off-by: Andrew Fyfe <andrew@neptune-one.net>
Signed-off-by: Dan McGee <dan@archlinux.org>
Diffstat (limited to 'scripts/gensync')
| -rwxr-xr-x | scripts/gensync | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/scripts/gensync b/scripts/gensync index 5a3dab88..f99cf597 100755 --- a/scripts/gensync +++ b/scripts/gensync @@ -22,6 +22,8 @@ myver='3.0.0' +# functions + usage() { echo "gensync $myver" echo "usage: $0 <root> <destfile> [package_directory]" @@ -45,11 +47,6 @@ usage() { exit 0 } -BUILDSCRIPT="PKGBUILD" -PKGEXT="pkg.tar.gz" - -source /etc/makepkg.conf - error () { echo "==> ERROR: $*" >&2 } @@ -70,6 +67,8 @@ check_force () { false } +# PROGRAM START + if [ $# -lt 2 ]; then usage exit 1 @@ -80,6 +79,19 @@ if [ "$1" = "-h" -o "$1" = "--help" ]; then exit 0 fi +# source system and user makepkg.conf +if [ -r /etc/makepkg.conf ]; then + source /etc/makepkg.conf +else + echo "ERROR: /etc/makepkg.conf not found. Can not continue." >&2 + exit 1 # $E_CONFIG_ERROR # TODO: error codes +fi + +if [ -r ~/.makepkg.conf ]; then + source ~/.makepkg.conf +fi + + d=$(dirname $1) rootdir="$(cd $d && pwd)/$(basename $1)" d="$(dirname $2)" |