From 21ab9b8f14d06107f5be47417ceb3f3842c09031 Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 8 Oct 2009 20:17:51 +0000
Subject: [PATCH] change linux build script to create tarball to always have
 xcat-core subdir, never core-snap

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4327 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 buildcore.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/buildcore.sh b/buildcore.sh
index 9fdea4c8a..91efd4fc9 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -28,6 +28,7 @@ CURDIR=`pwd`
 D=${CURDIR/\/src\/xcat-core/}
 REL=`basename $D`
 
+XCATCORE="xcat-core"
 VER=`cat Version`
 if [ "$PROMOTE" = 1 ]; then
 	CORE="xcat-core"
@@ -36,7 +37,7 @@ else
 	CORE="core-snap"
 	TARNAME=core-rpms-snap.tar.bz2
 fi
-DESTDIR=../../$CORE
+DESTDIR=../../$XCATCORE
 
 
 if [ "$PROMOTE" != 1 ]; then      # very long if statement to not do builds if we are promoting
@@ -188,11 +189,14 @@ fi
 
 # Build the tarball
 cd ..
-tar -hjcvf $TARNAME $CORE
+tar -hjcvf $TARNAME $XCATCORE
 chgrp xcat $TARNAME
 chmod g+w $TARNAME
 
 # Upload the individual RPMs to sourceforge
+if [ ! -e core-snap ]; then
+	ln -s xcat-core core-snap
+fi
 while ! rsync -urLv --delete $CORE $UPLOADUSER,xcat@web.sourceforge.net:htdocs/yum/$REL/
 do : ; done
 
@@ -212,8 +216,8 @@ if [ "$REL" = "devel" -a "$PROMOTE" != 1 ]; then
 	mkdir -p man
 	cd man
 	rm -rf opt
-	rpm2cpio ../$CORE/xCAT-client-*.noarch.rpm | cpio -id '*.html'
-	rpm2cpio ../$CORE/perl-xCAT-*.noarch.rpm | cpio -id '*.html'
+	rpm2cpio ../$XCATCORE/xCAT-client-*.noarch.rpm | cpio -id '*.html'
+	rpm2cpio ../$xCATCORE/perl-xCAT-*.noarch.rpm | cpio -id '*.html'
 	# Note: for some reason scp kept getting "Connection reset by peer" part way thru
 	while ! rsync -rv opt/xcat/share/doc/man1 opt/xcat/share/doc/man3 opt/xcat/share/doc/man5 opt/xcat/share/doc/man7 opt/xcat/share/doc/man8 $UPLOADUSER,xcat@web.sourceforge.net:htdocs/
 	do : ; done