diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-04 14:09:31 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-04 14:09:31 -0400 |
| commit | 9dd19a89b3f66257fe42b20f40a8f6ce59ed77f6 (patch) | |
| tree | 5cb14d1dae7d757afafed4cd318b8162ada01328 /src/chroot-tools | |
| parent | f5b650a06cddd447ad7a75330e9e9c6baf23ccc4 (diff) | |
conf.sh: generalize {get,set}_conf_makepkg to {get,set}_var
Diffstat (limited to 'src/chroot-tools')
| -rwxr-xr-x | src/chroot-tools/libremakepkg | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index f808070..fc6418c 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -219,12 +219,12 @@ main() { # Load makepkg configuration ########################################### # Note that all of these are globals - SRCDEST="$(get_conf_makepkg SRCDEST "$PWD")" - PKGDEST="$(get_conf_makepkg PKGDEST "$PWD")" - LOGDEST="$(get_conf_makepkg LOGDEST "$PWD")" + SRCDEST="$(get_var makepkg SRCDEST "$PWD")" + PKGDEST="$(get_var makepkg PKGDEST "$PWD")" + LOGDEST="$(get_var makepkg LOGDEST "$PWD")" mkdir -p "$SRCDEST" "$PKGDEST" "$LOGDEST" - MAKEFLAGS="$(get_conf_makepkg MAKEFLAGS '')" - PACKAGER="$(get_conf_makepkg PACKAGER '')" + MAKEFLAGS="$(get_var makepkg MAKEFLAGS '')" + PACKAGER="$(get_var makepkg PACKAGER '')" librechroot_flags=( -r "$PWD:/startdir_host" @@ -249,7 +249,7 @@ main() { # Set target CARCH # note that we waited until after locking/creating the chroot to do this - export CARCH="$(MAKEPKG_CONF=$copydir/etc/makepkg.conf get_conf_makepkg CARCH)" + export CARCH="$(MAKEPKG_CONF=$copydir/etc/makepkg.conf get_var makepkg CARCH)" # Pre-build msg 'Starting pre-build activities...' |