Changeset 31637

Timestamp:

2017-04-27T20:46:05+12:00 (7 years ago)

Author:

ak19

Message:

FileAssociationManager no longer uses ExternalProgram to run the which command, uses SafeProcess.

File:

• main/trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java (modified) (3 diffs)

main/trunk/gli/src/org/greenstone/gatherer/file/FileAssociationManager.java

@@ -35 +35 @@
 import org.greenstone.gatherer.gui.FileAssociationDialog;
 import org.greenstone.gatherer.gui.PreviewCommandDialog;
-import org.greenstone.gatherer.util.ExternalProgram;
+import org.greenstone.gatherer.util.SafeProcess;
 import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
@@ -115 +115 @@
     } else {
         // we try to look for a browser
-        String [] browsers = new String [] {"mozilla", "netscape"};
+        String [] browsers = new String [] {"mozilla", "netscape", "firefox"};
         for (int i=0; i<browsers.length; i++) {
         if (isAvailable(browsers[i])) {
@@ -354 +354 @@
     protected boolean isAvailable(String program) {
     try {
-        ExternalProgram e = new ExternalProgram("which", program);
-        e.exitProgram();
-        String out = e.getLineOfProgramOutput();
-        if (out == null) {
+        // `which bla` does nothing, prompt is returned
+        // `which grep` returns a line of output with the path to grep
+        SafeProcess prcs = new SafeProcess("which " + program);
+        prcs.runProcess();
+        String output = prcs.getStdOutput();
+        if(output.equals("")) {
         return false;
         }
+        //System.err.println("*** 'which " + program + "' returned: " + output);
         return true;
     } catch (Exception exc) {