Changeset 31482 for main

Timestamp:

2017-03-09T19:22:17+13:00 (7 years ago)

Author:

ak19

Message:

Fixing a copy paste error discovered when testing another branch through the modified code.

File:

• main/trunk/greenstone3/gs3-setup.sh (modified) (3 diffs)

main/trunk/greenstone3/gs3-setup.sh

@@ -9 +9 @@
 # java_min_version gets passed to search4j as the minimum java version
 java_min_version=1.5.0_00
-DEBUG=false
+DEBUG=true
 
 function testSource(){
@@ -290 +290 @@
   # 3. check the bitness of any bundled JRE, and use if appropriate
   if [ "$javaset" != "true" ] && [ -d "$BUNDLED_JRE" ]; then
-      checkJavaBitnessAgainstGSBitness "$FOUNDJREHOME" "$bitness"
+      checkJavaBitnessAgainstGSBitness "$BUNDLED_JRE" "$bitness"
       
       # For linux, the bundled JRE ought to be of a bitness matching this OS.
@@ -296 +296 @@
       if [ "$bitness" != "-1" ] && [ "$DEBUG" == "true" ]; then
           # bundled JRE matches GS bitness
-          echo "*** Changing to use Greenstone's bundled $bitness-bit jre"
+          echo "*** Changing to use Greenstone's bundled $bitness-bit jre at $BUNDLED_JRE"
       fi
       setupJavaAt "$BUNDLED_JRE" "JRE"