summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhillip Smith <fukawi2@gmail.com>2011-11-01 12:00:47 +1100
committerDan McGee <dan@archlinux.org>2011-11-20 21:36:30 -0600
commit5ba8b83b8be55b9d7a55cc8bfdef80c37117101d (patch)
tree9a5ce003c55c239855b0813cfda58642fe462f06
parentcb898be887160e1e14ff0f1e3a3e506fc796ef57 (diff)
downloadpacman-5ba8b83b8be55b9d7a55cc8bfdef80c37117101d.tar.xz
makepkg: add support for PACKAGER environment var
Add support for overriding configuration in /etc/makepkg.conf and ~/.makepkg.conf by setting the environment variable PACKAGER similar to how SRCDEST and PKGDEST behave. Signed-off-by: Allan McRae <allan@archlinux.org>
-rw-r--r--doc/makepkg.8.txt4
-rw-r--r--scripts/makepkg.sh.in2
2 files changed, 6 insertions, 0 deletions
diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt
index f693a5a8..df41e187 100644
--- a/doc/makepkg.8.txt
+++ b/doc/makepkg.8.txt
@@ -207,6 +207,10 @@ Environment Variables
Folder where the downloaded sources will be stored. Overrides the
corresponding value defined in linkman:makepkg.conf[5].
+**PACKAGER=**"John Doe <john@doe.com>"::
+ String to identify the creator of the resulting package. Overrides
+ the corresponding value defined in linkman:makepkg.conf[5].
+
**BUILDDIR=**"/path/to/folder"::
Folder where the package will be built. Overrides the corresponding
value defined in linkman:makepkg.conf[5].
diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 085fbb91..914cacbe 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1962,6 +1962,7 @@ set -E
[[ -n ${PKGEXT} ]] && _PKGEXT=${PKGEXT}
[[ -n ${SRCEXT} ]] && _SRCEXT=${SRCEXT}
[[ -n ${GPGKEY} ]] && _GPGKEY=${GPGKEY}
+[[ -n ${PACKAGER} ]] && _PACKAGER=${PACKAGER}
# default config is makepkg.conf
MAKEPKG_CONF=${MAKEPKG_CONF:-$confdir/makepkg.conf}
@@ -2044,6 +2045,7 @@ SRCPKGDEST=${SRCPKGDEST:-$startdir} #default to $startdir if undefined
PKGEXT=${_PKGEXT:-$PKGEXT}
SRCEXT=${_SRCEXT:-$SRCEXT}
GPGKEY=${_GPGKEY:-$GPGKEY}
+PACKAGER=${_PACKAGER:-$PACKAGER}
if (( HOLDVER )) && [[ -n $FORCE_VER ]]; then
# The '\\0' is here to prevent gettext from thinking --holdver is an option