From 4b5906bbd5e6329ec821c0cefdcfbc838216b243 Mon Sep 17 00:00:00 2001 From: bp-sawyers Date: Fri, 15 May 2009 17:59:17 +0000 Subject: [PATCH] Build script fix for promotion git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3395 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- buildcore.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/buildcore.sh b/buildcore.sh index ea690ef8b..8d4d1abf4 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -23,7 +23,7 @@ D=${CURDIR/\/src\/xcat-core/} REL=`basename $D` VER=`cat Version` -if [ "$2" = "promote" ]; then +if [ "$1" = "promote" ]; then CORE="xcat-core" TARNAME=xcat-core-$VER.tar.bz2 else @@ -33,7 +33,7 @@ fi DESTDIR=../../$CORE -if [ "$2" != "promote" ]; then # very long if statement to not do builds if we are promoting +if [ "$1" != "promote" ]; then # very long if statement to not do builds if we are promoting mkdir -p $DESTDIR SRCDIR=../../core-snap-srpms mkdir -p $SRCDIR @@ -164,7 +164,7 @@ fi # end of very long if-not-promote # Modify the repo file to point to either xcat-core or core-snap cd $DESTDIR -if [ "$2" = "promote" ]; then +if [ "$1" = "promote" ]; then sed -e 's|/core-snap|/xcat-core|' xCAT-core.repo > xCAT-core.repo.new mv -f xCAT-core.repo.new xCAT-core.repo else @@ -180,7 +180,7 @@ chmod g+w $TARNAME # Upload the tarball and individual RPMs to sourceforge rsync -rLv --delete $CORE $UPLOADUSER,xcat@web.sourceforge.net:htdocs/yum/$REL/ -if [ "$2" = "promote" -a "$1" != "devel" ]; then +if [ "$1" = "promote" -a "$1" != "devel" ]; then # upload tarball to FRS area scp $TARNAME $UPLOADUSER@web.sourceforge.net:uploads/ echo "$TARNAME has been uploaded to the FRS uploads dir. Remember to move it into the release."