From 68f26bc831dab4967a2850a614b3d798eb01c234 Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 19 Apr 2010 13:30:22 +0000
Subject: [PATCH] Fix build script problems when moving up to next release.

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

diff --git a/buildcore.sh b/buildcore.sh
index e91955e6a..9d2eacb9c 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -56,6 +56,7 @@ XCATCORE="xcat-core"
 svn up Version
 VER=`cat Version`
 SHORTVER=`cat Version|cut -d. -f 1,2`
+SHORTSHORTVER=`cat Version|cut -d. -f 1`
 if [ "$PROMOTE" = 1 ]; then
 	CORE="xcat-core"
 	if [ "$OSNAME" = "AIX" ]; then
@@ -126,7 +127,7 @@ if $GREP xCAT-client $SVNUP; then
    mv $source/SRPMS/xCAT-client-$VER*rpm $SRCDIR/
 fi
 if [ "$OSNAME" = "AIX" ]; then
-	echo "rpm -Uvh xCAT-client-$SHORTVER*rpm" >> $DESTDIR/instxcat
+	echo "rpm -Uvh xCAT-client-$SHORTSHORTVER*rpm" >> $DESTDIR/instxcat
 fi
 
 if $GREP xCAT-UI $SVNUP; then
@@ -139,7 +140,7 @@ if $GREP xCAT-UI $SVNUP; then
 fi
 # Do not automatically install xCAT-UI on AIX
 #if [ "$OSNAME" = "AIX" ]; then
-#	echo "rpm -Uvh xCAT-UI-$SHORTVER*rpm" >> $DESTDIR/instxcat
+#	echo "rpm -Uvh xCAT-UI-$SHORTSHORTVER*rpm" >> $DESTDIR/instxcat
 #fi
 
 if $GREP xCAT-IBMhpc $SVNUP; then
@@ -152,7 +153,7 @@ if $GREP xCAT-IBMhpc $SVNUP; then
 fi
 # Do not automatically install xCAT-IBMhpc on AIX
 #if [ "$OSNAME" = "AIX" ]; then
-#	echo "rpm -Uvh xCAT-IBMhpc-$SHORTVER*rpm" >> $DESTDIR/instxcat
+#	echo "rpm -Uvh xCAT-IBMhpc-$SHORTSHORTVER*rpm" >> $DESTDIR/instxcat
 #fi
 
 if $GREP xCAT-server $SVNUP; then
@@ -164,7 +165,7 @@ if $GREP xCAT-server $SVNUP; then
    mv $source/SRPMS/xCAT-server-$VER*rpm $SRCDIR
 fi
 if [ "$OSNAME" = "AIX" ]; then
-	echo "rpm -Uvh xCAT-server-$SHORTVER*rpm" >> $DESTDIR/instxcat
+	echo "rpm -Uvh xCAT-server-$SHORTSHORTVER*rpm" >> $DESTDIR/instxcat
 fi
 
 if $GREP xCAT-rmc $SVNUP; then
@@ -193,8 +194,8 @@ fi
 
 if $GREP -E '^[UAD] +xCATsn/' $SVNUP; then
    UPLOAD=1
-   rm -f $DESTDIR/xCATsn-$SHORTVER*rpm
-   rm -f $SRCDIR/xCATsn-$SHORTVER*rpm
+   rm -f $DESTDIR/xCATsn-*rpm
+   rm -f $SRCDIR/xCATsn-*rpm
 	if [ "$OSNAME" = "AIX" ]; then
 		./makexcatsnrpm
 		mv $source/RPMS/*/xCATsn-$VER*rpm $DESTDIR
@@ -214,8 +215,8 @@ fi
 
 if $GREP -E '^[UAD] +xCAT/' $SVNUP; then
    UPLOAD=1
-   rm -f $DESTDIR/xCAT-$SHORTVER*rpm
-   rm -f $SRCDIR/xCAT-$SHORTVER*rpm
+   rm -f $DESTDIR/xCAT-$SHORTSHORTVER*rpm
+   rm -f $SRCDIR/xCAT-$SHORTSHORTVER*rpm
 	if [ "$OSNAME" = "AIX" ]; then
 	   ./makexcatrpm
 	   mv $source/RPMS/*/xCAT-$VER*rpm $DESTDIR
@@ -234,8 +235,8 @@ if $GREP -E '^[UAD] +xCAT/' $SVNUP; then
 fi
 
 if [ "$OSNAME" = "AIX" ]; then
-	echo "rpm -Uvh xCAT-$SHORTVER*rpm" >> $DESTDIR/instxcat
-	echo "rpm -Uvh xCAT-rmc-$SHORTVER*rpm" >> $DESTDIR/instxcat
+	echo "rpm -Uvh xCAT-$SHORTSHORTVER*rpm" >> $DESTDIR/instxcat
+	echo "rpm -Uvh xCAT-rmc-$SHORTSHORTVER*rpm" >> $DESTDIR/instxcat
 	# add the service node bundle files 
 	cp xCATaixSN.bnd xCATaixSN2.bnd xCATaixSSH.bnd xCATaixSSL.bnd $DESTDIR/
 fi