Changeset 31970 for main/trunk

Timestamp:

2017-09-15T20:49:31+12:00 (7 years ago)

Author:

ak19

Message:

Unused, but possibly useful, commented out code

Location:

main/trunk/gli

Files:

• gli.sh (modified) (1 diff)
• src/org/greenstone/gatherer/util/SafeProcess.java (modified) (1 diff)

main/trunk/gli/gli.sh

@@ -87 +87 @@
     exit 1;
 fi
+## if we're using a bundled java in GS2, then put the bundled java into the environment too (don't just use it to launch GLI)
+#if [[ $javapath == *"/packages/jre"* ]]; then
+#    if [ "$_version" -eq 2 ]; then
+#   export JRE_HOME=$GSDLHOME/packages/jre
+## Shouldn't be necessary to set JAVA_HOME to JRE_HOME. If only JRE_HOME exists, it should suffice for GLI:
+#   ##export JAVA_HOME=$JRE_HOME
+#   echo "@@@ SETTING JAVA ENV TO THE BUNDLED JRE: JRE_HOME: $JRE_HOME"
+#   export PATH=$JRE_HOME/bin:$PATH
+#    fi
+#fi
+
 
 ## ---- Check that the GLI has been compiled ----

main/trunk/gli/src/org/greenstone/gatherer/util/SafeProcess.java

@@ -308 +308 @@
         prcs = rt.exec(this.command_args);
         } else { // launch process using cmd str with env params        
-        
+
+        //log("Environment: ");
+        //for(int i = 0; i < envp.length; i++) {
+        //    log("\t" + envp[i]);
+        //}
+
         if(this.dir == null) {
             //log("\twith: " + Arrays.toString(this.envp));