From 309400c332e4691b0b0d7ee4598a150942705815 Mon Sep 17 00:00:00 2001
From: bp-sawyers <bp-sawyers@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 27 Dec 2011 10:44:55 +0000
Subject: [PATCH] Make uploading to FRS area the default in the trunk

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11306 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 buildcore.sh         | 4 ++--
 builddep.sh          | 8 ++++----
 xCAT-UI/xCAT-UI.spec | 2 ++
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/buildcore.sh b/buildcore.sh
index c3a2235ec..62f821dfd 100755
--- a/buildcore.sh
+++ b/buildcore.sh
@@ -25,7 +25,7 @@
 #					xcat-core tarball to the SF web site instead of the FRS area.
 # 		UP=0 or UP=1 - override the default upload behavior 
 # 		SVNUP=<filename> - control which rpms get built by specifying a coresvnup file
-#       FRSYUM=1 - put the yum repo and snap builds in the FRS area instead of project web area.
+#       FRSYUM=0 - put the yum repo and snap builds in the old project web area instead of the FRS area.
 #		VERBOSE=1 - to see lots of verbose output
 
 # you can change this if you need to
@@ -67,7 +67,7 @@ if [ "$OSNAME" != "AIX" ]; then
 fi
 
 # this is needed only when we are transitioning the yum over to frs
-if [ "$FRSYUM" = 1 ]; then
+if [ "$FRSYUM" != 0 ]; then
 	YUMDIR=$FRS
 	YUMREPOURL="https://sourceforge.net/projects/xcat/files/yum"
 else
diff --git a/builddep.sh b/builddep.sh
index f57e153d0..80935b693 100755
--- a/builddep.sh
+++ b/builddep.sh
@@ -15,7 +15,7 @@
 #		DESTDIR=<dir> - the dir to place the dep tarball in.  The default is ../../../xcat-dep, relative
 #					to where this script is located.
 # 		UP=0 or UP=1 - override the default upload behavior 
-#       FRSYUM=1 - put the directory of individual rpms in the FRS area instead of project web area.
+#       FRSYUM=0 - put the directory of individual rpms in the project web area instead of the FRS area.
 #		VERBOSE=1 - to see lots of verbose output
 
 # you can change this if you need to
@@ -45,7 +45,7 @@ fi
 # this is needed only when we are transitioning the yum over to frs
 YUMREPOURL1="http://xcat.sourceforge.net/yum"
 YUMREPOURL2="https://sourceforge.net/projects/xcat/files/yum"
-if [ "$FRSYUM" = 1 ]; then
+if [ "$FRSYUM" != 0 ]; then
 	YUMDIR=$FRS
 	YUMREPOURL="$YUMREPOURL2"
 else
@@ -115,7 +115,7 @@ if [ "$OSNAME" != "AIX" ]; then
 	done
 
 	# Modify xCAT-dep.repo files to point to the correct place
-	if [ "$FRSYUM" = 1 ]; then
+	if [ "$FRSYUM" != 0 ]; then
 		newurl="$YUMREPOURL2"
 		oldurl="$YUMREPOURL1"
 	else
@@ -230,7 +230,7 @@ fi
 # Upload the dir structure to SF yum area.  Currently we do not have it preserving permissions
 # because that gives errors when different users try to do it.
 i=0
-if [ "$FRSYUM" = 1 ]; then
+if [ "$FRSYUM" != 0 ]; then
 	links="-L"		# FRS does not support rsyncing sym links
 else
 	links="-l"
diff --git a/xCAT-UI/xCAT-UI.spec b/xCAT-UI/xCAT-UI.spec
index c699a3a9a..2bf98abae 100644
--- a/xCAT-UI/xCAT-UI.spec
+++ b/xCAT-UI/xCAT-UI.spec
@@ -46,6 +46,7 @@ FILES=`find ${UI_JS} -name '*.js'`
 for i in ${FILES[*]}; do
 	# Ignore Javascripts that are already minified
 	if [[ ! $i =~ '.*\.min\.js$' ]]; then
+		echo "  Minifying $i ..."
 		`${JAVA} -jar ${COMPILER_JAR} --warning_level=QUIET --js=$i --js_output_file=$i.min`
 		
 		# Remove old Javascript and replace it with minified version
@@ -61,6 +62,7 @@ FILES=`find ${UI_JS} -name '*.js'`
 for i in ${FILES[*]}; do
 	# Ignore Javascripts that are already minified
 	if [[ ! $i = @(*.min.js) ]]; then
+		echo "  Minifying $i ..."
 		`${JAVA} -jar ${COMPILER_JAR} --warning_level=QUIET --js=$i --js_output_file=$i.min`
 		
 		# Remove old Javascript and replace it with minified version