summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-06-11 20:27:00 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-06-11 20:27:00 -0600
commit9fb35767dc99e07fb825c03787add5f11bae9a10 (patch)
tree8f497f775bd959940832cad69af2e9d6f3b8d16a
parentc77febdf0732512def7f44dafdca5565dbb7d13b (diff)
libremakepkg: improve behavior when PACKAGER is not set
-rwxr-xr-xsrc/chroot-tools/libremakepkg9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index cf2d880..f7391ee 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -180,8 +180,10 @@ chroot_init() {
MAKEPKG_CONF="$copydir/etc/makepkg.conf" set_conf_makepkg PKGDEST /pkgdest
MAKEPKG_CONF="$copydir/etc/makepkg.conf" set_conf_makepkg SRCDEST /srcdest
- local PACKAGER="$(get_conf_makepkg PACKAGER .)"
- MAKEPKG_CONF="$copydir/etc/makepkg.conf" set_conf_makepkg PACKAGER "$PACKAGER"
+ local PACKAGER="$(get_conf_makepkg PACKAGER '')"
+ if [[ -n $PACKAGER ]]; then
+ MAKEPKG_CONF="$copydir/etc/makepkg.conf" set_conf_makepkg PACKAGER "$PACKAGER"
+ fi
unset PACKAGER
if ! grep -q '^\[repo\]' "$copydir/etc/pacman.conf"; then
@@ -274,7 +276,8 @@ usage() {
echo 'configuration changes in the chroot:'
echo ' - whatever changes `librechroot` makes.'
echo ' - set `PKGDEST` and `SRCDEST` in `/etc/makepkg.conf`'
- echo ' - set `PACKAGER` in `/etc/makepkg.conf`'
+ echo ' - set `PACKAGER` in `/etc/makepkg.conf` to reflect the value'
+ echo ' outside of the chroot.'
echo ' - (maybe) delete `/build/.makepkg.conf`'
echo ' - (maybe) delete `/build/.ssh/config`'
echo 'If run from inside of a chroot, this command will:'