Changeset 31877 for main/trunk/gli/src/org/greenstone/gatherer/download/ServerInfoDialog.java

Timestamp:

2017-08-11T17:07:44+12:00 (7 years ago)

Author:

ak19

Message:

Getting Windows wget to use proxy settings in environment. They didn't need to be in CAPS, as Windows has the side effect of setting env vars in both the original case of the letters of the env variable name as well as in all caps, and unsetting either version unsets both. On Windows however, I noticed that Perl was not on the PATH after open3() in WgetDownload.pm::useWget() failed with an unclear error message. So now the PATH is also propagated from Java to the perl code for downloading using wget.

File:

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

main/trunk/gli/src/org/greenstone/gatherer/download/ServerInfoDialog.java

@@ -104 +104 @@
     String[] command = (String[]) commands.toArray(new String[0]);
     DebugStream.println("Getting server info: "+commands);
-    try {
-        String [] env = null;
+    try {       
         SafeProcess prcs = null;
         
-        if (Utility.isWindows()) {
-        prcs = new SafeProcess(command);
-        }
-        else {
-        if (proxy_url != null && !proxy_url.equals("")) {           
+        if (proxy_url != null && !proxy_url.equals("")) {
             // Specify proxies as environment variables
             // Need to manually specify GSDLHOME and GSDLOS also
-            env = new String[6];
-                    proxy_url = proxy_url.replaceAll("http://","");
-            env[0] = "http_proxy=http://"+proxy_url;
-            env[1] = "https_proxy=http://"+proxy_url; // yes, HTTP protocol for https:// too
+            
+            proxy_url = proxy_url.replaceAll("http://","");
+            
+            String [] env = new String[7];
+            
+            env[0] = "http_proxy=http://"+proxy_url;
+            env[1] = "https_proxy=http://"+proxy_url; // yes, HTTP protocol for https:// too
                            // see also https://wiki.archlinux.org/index.php/proxy_settings
-            env[2] = "ftp_proxy=ftp://"+proxy_url;
+            env[2] = "ftp_proxy=ftp://"+proxy_url;
             env[3] = "GSDLHOME=" + Configuration.gsdl_path;
             env[4] = "GSDLOS=" + Gatherer.client_operating_system;
             env[5] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc"; // teach it where the wgetrc file lives, in gs2build/bin/<os>
+            // If PATH is not made available, so that Perl is not on the PATH, then WgetDownload.pm's open3() call
+            // to run wget fails with cryptic failure message. So make PATH available for open3():
+            env[6] = "PATH="+System.getenv("PATH");
+            
             prcs = new SafeProcess(command, env, null);
         } 
@@ -130 +132 @@
             prcs = new SafeProcess(command);
         }
-        }
         
         // special processing of Process' stderr stream: