aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2012-07-18 03:59:43 +0000
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2012-07-18 03:59:43 +0000
commit50891e6e0713138408d83db618bbbdee0ac82609 (patch)
tree989957ccbaa53c4fb34ad858acaddc9d8a0472cb /tools
parentStop dropping /usr/share/doc in the admincd. (diff)
downloadreleng-50891e6e0713138408d83db618bbbdee0ac82609.tar.gz
releng-50891e6e0713138408d83db618bbbdee0ac82609.tar.bz2
releng-50891e6e0713138408d83db618bbbdee0ac82609.zip
Fix the catalst-auto-x86.conf file.
Diffstat (limited to 'tools')
-rw-r--r--tools/catalyst-auto-x86.conf7
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index b1cbe958..26f82b1f 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -56,7 +56,7 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-i[46]86-*${DATESTAMP}*.bz2* ]
+ if [ -f stage3-i[46]86-*${DATESTAMP}*.bz2* ]; then
# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
# cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
@@ -64,7 +64,6 @@ post_build() {
# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
fi
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
fi
popd
@@ -73,6 +72,10 @@ post_build() {
# mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
# cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
+ if [ -f *${DATESTAMP}*.iso ]; then
+# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/
+ fi
fi
}