diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-19 10:00:18 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-19 10:00:18 -0500 |
| commit | 83a55baf27a6e6f3fa3e6772a6f1b63f4c5138d7 (patch) | |
| tree | abfb9f1244aa52786ed2de129299d63f9ea79b31 /src/chroot-tools/libremakepkg | |
| parent | 0fd1e7b1333b8793c1cc448c2a00cb085544cc8c (diff) | |
libremakepkg: actually support SRCPKGDEST, document LOGDEST support
Diffstat (limited to 'src/chroot-tools/libremakepkg')
| -rwxr-xr-x | src/chroot-tools/libremakepkg | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg index dbeeb81..dcc495c 100755 --- a/src/chroot-tools/libremakepkg +++ b/src/chroot-tools/libremakepkg @@ -33,7 +33,7 @@ umask 0022 readonly _indent="$(librelib chroot/indent)" readonly INCHROOT=$([[ -f /.arch-chroot ]] && echo true || echo false) NONET=true # can be changed with the -N flag -# {SRC,LOG,PKG}DEST set at runtime by makepkg.conf +# {PKG,SRC,SRCPKG,LOG}DEST set at runtime by makepkg.conf # MAKEFLAGS, PACKAGER set at runtime by makepkg.conf # LIBREUSER, LIBREHOME are set by conf.sh librechroot_flags=() @@ -132,7 +132,7 @@ usage() { prose 'If run from outside of a chroot, command will make the following configuration changes in the chroot:' bullet 'whatever changes `librechroot` makes.' - bullet 'set `PKGDEST` and `SRCDEST` in `/etc/makepkg.conf`' + bullet 'set `{PKG,SRC,SRCPKG,LOG}DEST` in `/etc/makepkg.conf`' bullet 'set `PACKAGER` in `/etc/makepkg.conf` to reflect the value outside of the chroot.' bullet '(maybe) delete `/build/.makepkg.conf`' @@ -227,10 +227,11 @@ main() { # Load makepkg configuration ########################################### # Note that all of these are globals - SRCDEST="$(get_var makepkg SRCDEST "$PWD")" PKGDEST="$(get_var makepkg PKGDEST "$PWD")" + SRCDEST="$(get_var makepkg SRCDEST "$PWD")" + SRCPKGDEST="$(get_var makepkg SRCPKGDEST "$PWD")" LOGDEST="$(get_var makepkg LOGDEST "$PWD")" - mkdir -p "$SRCDEST" "$PKGDEST" "$LOGDEST" + mkdir -p -- "$PKGDEST" "$SRCDEST" "$SRCPKGDEST" "$LOGDEST" MAKEFLAGS="$(get_var makepkg MAKEFLAGS '')" PACKAGER="$(get_var makepkg PACKAGER '')" |