[gentoo-commits] proj/catalyst:master commit in: targets/support/

[Richard Farina]

commit:     64c1787ab549a95c7350fd03c2a22c5f6a073b19
Author:     Rick Farina (Zero_Chaos) <zerochaos <AT> gentoo <DOT> org>
AuthorDate: Thu Nov  1 23:59:50 2012 +0000
Commit:     Richard Farina <zerochaos <AT> gentoo <DOT> org>
CommitDate: Thu Nov  1 23:59:50 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=64c1787a

Revert "Make sure we have ${destdir} on copy_to_chroot and simplify exec_in_chroot."

This reverts commit 17b34223a4afc1f070ac2fb9bdfb51e47c03db61.

---
 targets/support/functions.sh |   42 ++++++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index af57c10..a0eaae2 100644
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -1,7 +1,6 @@
 copy_to_chroot() {
 	local src_file=$1
 	local dest_dir=${clst_chroot_path}${2:-/tmp}
-	mkdir -p ${dest_dir}
 	echo "copying ${src_file##*/} to ${dest_dir}"
 	cp -pPR "${src_file}" "${dest_dir}"/
 }
@@ -19,19 +18,34 @@ exec_in_chroot(){
 # copies the file to the /tmp directory of the chroot
 # and executes it.
 	local file_name=$(basename ${1})
-	local subdir=${2}
-	local destdir=${subdir}/tmp
-	destdir=${destdir#/}
-
-	copy_to_chroot ${1} ${destdir}
-	chroot_path=${clst_chroot_path}${subdir}
-	copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
-		${destdir}
-	echo "Running ${file_name} in chroot ${chroot_path}"
-	${clst_CHROOT} ${chroot_path} ${destdir}/${file_name} || exit 1
-
-	delete_from_chroot ${destdir}/${file_name}
-	delete_from_chroot ${destdir}/chroot-functions.sh
+	local subdir=${2#/}
+
+	if [ "${subdir}" != "" ]
+	then
+		copy_to_chroot ${1} ${subdir}/tmp/
+		chroot_path=${clst_chroot_path}${subdir}
+		copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+			${subdir}/tmp/
+		echo "Running ${file_name} in chroot ${chroot_path}"
+		${clst_CHROOT} ${chroot_path} /tmp/${file_name} || exit 1
+	else
+		copy_to_chroot ${1} tmp/
+		chroot_path=${clst_chroot_path}
+		copy_to_chroot ${clst_sharedir}/targets/support/chroot-functions.sh \
+			tmp/
+		echo "Running ${file_name} in chroot ${chroot_path}"
+		${clst_CHROOT} ${chroot_path}/ /tmp/${file_name} || exit 1
+	fi
+
+	rm -f ${chroot_path}/tmp/${file_name}
+	if [ "${subdir}" != "" ]
+	then
+		delete_from_chroot ${subdir}/tmp/${file_name}
+		delete_from_chroot ${subdir}/tmp/chroot-functions.sh
+	else
+		delete_from_chroot tmp/chroot-functions.sh
+		delete_from_chroot tmp/${file_name}
+	fi
 }
 
 #return codes