Changeset 31877 for main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.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/gui/DownloadPane.java (modified) (2 diffs)

main/trunk/gli/src/org/greenstone/gatherer/gui/DownloadPane.java

@@ -780 +780 @@
         
         // Write the use proxy command - we don't do this anymore, instead we set environment variables - hopefully these can't be spied on like the following can (using ps) - actually the environment stuff didn't work for windows, so lets go back to this
-        if (Utility.isWindows()) {
+        /*if (Utility.isWindows()) {
         
            arg = current_download.getArgument("user_name");
@@ -790 +790 @@
            arg.setAssigned(true);
           }
-           else{
+         
+           else{*/
             String user_name = user_pass.substring(0, user_pass.indexOf("@"));
             String user_pwd = user_pass.substring(user_pass.indexOf("@") + 1);
             proxy_url = user_name+":"+user_pwd+"@"+proxy_host+":"+proxy_port+"/";
            
-           }
+           /*}*/
         
            return true;