summaryrefslogtreecommitdiff
path: root/src/chroot-tools/libremakepkg
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2013-06-05 20:06:19 -0600
committerLuke Shumaker <LukeShu@sbcglobal.net>2013-06-05 20:06:19 -0600
commitdc75575a17044cd35d310ccd0a892f630f7f53cc (patch)
treec2be02bb0c39c152786946ba446fc3f994853c0c /src/chroot-tools/libremakepkg
parent90359e5549190507c24b3ac1111a55ced8e6c10c (diff)
libre{chroot,makepkg}: improve handling of when not configured
Diffstat (limited to 'src/chroot-tools/libremakepkg')
-rwxr-xr-xsrc/chroot-tools/libremakepkg10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/chroot-tools/libremakepkg b/src/chroot-tools/libremakepkg
index b86506a..cd81876 100755
--- a/src/chroot-tools/libremakepkg
+++ b/src/chroot-tools/libremakepkg
@@ -22,7 +22,6 @@
. $(librelib conf.sh)
load_files chroot
-[[ -f /.arch-chroot ]] || check_vars chroot CHROOTDIR CHROOT
. libremessages
makechrootpkg=$(librelib makechrootpkg)
@@ -257,10 +256,13 @@ main() {
if $INCHROOT; then
copydir='/'
- elif [[ ${COPY:0:1} = / ]]; then
- copydir=$COPY
else
- copydir="${CHROOTDIR}/${CHROOT}/${COPY}"
+ check_vars chroot CHROOTDIR CHROOT
+ if [[ ${COPY:0:1} = / ]]; then
+ copydir=$COPY
+ else
+ copydir="${CHROOTDIR}/${CHROOT}/${COPY}"
+ fi
fi
# Init #################################################################