diff --git a/buildcore.sh b/buildcore.sh index 516d553d9..ea690ef8b 100755 --- a/buildcore.sh +++ b/buildcore.sh @@ -46,13 +46,13 @@ else pkg="packages" fi -BUILDIT=0 if [ -z "$SVNUP" ]; then SVNUP=../coresvnup svn up > $SVNUP - if ! grep 'At revision' $SVNUP; then - BUILDIT=1 - fi +fi +BUILDIT=0 +if ! grep 'At revision' $SVNUP; then + BUILDIT=1 fi if $GREP xCAT-client $SVNUP; then @@ -63,7 +63,7 @@ if $GREP xCAT-client $SVNUP; then mv /usr/src/$pkg/RPMS/noarch/xCAT-client-$VER*rpm $DESTDIR/ mv /usr/src/$pkg/SRPMS/xCAT-client-$VER*rpm $SRCDIR/ fi -if [ $BUILDIT eq 1 ]; then #$GREP perl-xCAT $SVNUP; then +if [ $BUILDIT -eq 1 ]; then # Use to be: $GREP perl-xCAT $SVNUP; then UPLOAD=1 ./makeperlxcatrpm rm -f $DESTDIR/perl-xCAT*rpm diff --git a/builddep.sh b/builddep.sh index 4f48a9264..be5f5e229 100755 --- a/builddep.sh +++ b/builddep.sh @@ -54,4 +54,5 @@ rsync -rlv * $UPLOADUSER,xcat@web.sourceforge.net:htdocs/yum/xcat-dep/ # Upload the tarball to the SF uploads dir for the FRS scp ../$DFNAME $UPLOADUSER@web.sourceforge.net:uploads/ +echo "$DFNAME has been uploaded to the FRS uploads dir. Remember to move it into the release." #scp ../$DFNAME $UPLOADUSER@frs.sourceforge.net:uploads/