From e4d72cd2330fea4b8bcfb51d206aaf2c1cd5bc78 Mon Sep 17 00:00:00 2001 From: xq2005 Date: Fri, 22 Apr 2011 06:45:33 +0000 Subject: [PATCH] xCAT-UI build error on AIX(declare: not found) git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9371 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-UI/xCAT-UI.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xCAT-UI/xCAT-UI.spec b/xCAT-UI/xCAT-UI.spec index c118522fa..00de81eae 100644 --- a/xCAT-UI/xCAT-UI.spec +++ b/xCAT-UI/xCAT-UI.spec @@ -36,12 +36,11 @@ echo "Minifying Javascripts... This will take a couple of minutes." COMPILER_JAR='/xcat2/build/tools/compiler.jar' UI_JS="js/" +%ifos linux +JAVA='/opt/ibm/java-ppc64-60/jre/bin/java' # Find all Javascript files declare -a FILES FILES=`find ${UI_JS} -name '*.js'` - -%ifos linux -JAVA='/opt/ibm/java-ppc64-60/jre/bin/java' for i in ${FILES[*]}; do # Ignore Javascripts that are already minified if [[ ! $i =~ '.*\.min\.js$' ]]; then @@ -55,6 +54,8 @@ done %else # AIX JAVA='/usr/java6_64/bin/java' +# Find all Javascript files +FILES=`find ${UI_JS} -name '*.js'` for i in ${FILES[*]}; do # Ignore Javascripts that are already minified if [[ ! $i = @(*.min.js) ]]; then