From dc75575a17044cd35d310ccd0a892f630f7f53cc Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Wed, 5 Jun 2013 20:06:19 -0600
Subject: libre{chroot,makepkg}: improve handling of when not configured

---
 src/chroot-tools/libremakepkg | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/chroot-tools/libremakepkg')

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 #################################################################
-- 
cgit v1.2.2