Changeset 9217 for trunk/gli/src/org/greenstone/gatherer/util

Timestamp:

2005-03-01T10:39:23+13:00 (19 years ago)

Author:

mdewsnip

Message:

Fixed up a few problems with setting the wget path manually from the gli.sh file, and getting the default Greenstone wget path on the Mac.

File:

• trunk/gli/src/org/greenstone/gatherer/util/Utility.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/util/Utility.java

@@ -900 +900 @@
 
     /** returns the path to the greenstone version of wget */
-    static public String getWGetPath(String gsdl_path) {
+    static public String getWGetPath(String gsdl_path)
+    {
     if (isWindows()) {
-        return gsdl_path + "bin" + File.separator + 
-        "windows" + File.separator +"wget.exe";
-    } 
-    // is it the same for macs??
-    return gsdl_path + "bin" + File.separator + 
-        "linux" + File.separator + "wget";
+        return gsdl_path + "bin" + File.separator + "windows" + File.separator + "wget.exe";
+    }
+    else if (isMac()) {
+        return gsdl_path + "bin" + File.separator + "darwin" + File.separator + "wget";
+    }
+    else {
+        return gsdl_path + "bin" + File.separator + "linux" + File.separator + "wget";
+    }
     }