From 407605789e064db87d803b98c220e2fd2f7fbe53 Mon Sep 17 00:00:00 2001
From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" <jmbsvicetto@gentoo.org>
Date: Wed, 27 Apr 2016 01:58:51 +0000
Subject: [PATCH] Change copy logic.

Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
---
 tools/catalyst-auto-amd64-experimental.conf | 29 ++++++++++++++-------
 tools/catalyst-auto-x86-experimental.conf   | 28 +++++++++++++-------
 2 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 817c9535..93176507 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -69,23 +69,32 @@ pre_build() {
 
 post_build() {
 	pushd ${BUILD_SRCDIR_BASE}/default
-	if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
-		mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-		if [ -f *${DATESTAMP}*.iso ]; then
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+
+	mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+		if [ -f $file ]; then
+			cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
 		fi
+	done
+	if [ -f *${DATESTAMP}*.iso ]; then
+		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
 	fi
 	popd
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened
-	if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
-		mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-		cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-		if [ -f *${DATESTAMP}*.iso ]; then
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+
+	mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+		if [ -f $file ]; then
+			cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
 		fi
+	done
+
+	if [ -f *${DATESTAMP}*.iso ]; then
+		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
 	fi
+
+
 }
 
 # vim:ft=sh:
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 379adc0e..f8beb817 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -56,22 +56,30 @@ pre_build() {
 
 post_build() {
 	pushd ${BUILD_SRCDIR_BASE}/default
-	if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
-		mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-		cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-		if [ -f *${DATESTAMP}*.iso* ]; then
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+
+	mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+		if [ -f $file ]; then
+			cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
 		fi
+	done
+
+	if [ -f *${DATESTAMP}*.iso ]; then
+		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
 	fi
 	popd
 
 	pushd ${BUILD_SRCDIR_BASE}/hardened
-	if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
-		mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-		cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-		if [ -f *${DATESTAMP}*.iso ]; then
-			cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+
+	mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+	for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+		if [ -f $file ]; then
+			cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
 		fi
+	done
+
+	if [ -f *${DATESTAMP}*.iso ]; then
+		cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
 	fi
 }