Changeset 31697 for main/trunk/gli/src

Timestamp:

2017-05-22T16:55:02+12:00 (7 years ago)

Author:

ak19

Message:

More changes to bring SafeProcess GLI src version and GS3 src version up to speed with each other

File:

• main/trunk/gli/src/org/greenstone/gatherer/util/SafeProcess.java (modified) (2 diffs)

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

@@ -22 +22 @@
 
 import java.lang.reflect.Field;
-//import java.lang.reflect.Method;
 
 import org.apache.log4j.*;
@@ -897 +896 @@
     SafeProcess prcs = new SafeProcess("which " + program);     
     prcs.runProcess();
-    String output = prcs.getStdOutput();
+    String output = prcs.getStdOutput().trim();
+    ///System.err.println("*** 'which " + program + "' returned: |" + output + "|");
     if(output.equals("")) {
+        return false;
+    } else if(output.indexOf("no "+program) !=-1) { // from GS3's org.greenstone.util.BrowserLauncher.java's isAvailable(program)
+        log("@@@ SafeProcess.isAvailable(): " + program + "is not available");
         return false;
     }