Changeset 7690

Timestamp:

2004-07-01T17:30:34+12:00 (20 years ago)

Author:

kjdon

Message:

http_proxy environment vars don't seem to work under windows - put it back to having proxy stuff in the command for now, for windows

File:

• trunk/gli/src/org/greenstone/gatherer/collection/DownloadJob.java (modified) (1 diff)

trunk/gli/src/org/greenstone/gatherer/collection/DownloadJob.java

@@ -241 +241 @@
         }
         if(user_pass.indexOf("@") != -1) {
-        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+"/";
-        // 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 follwoing can (using ps)
-        //command = command + "-e httpproxy=" + proxy_host + ":" + proxy_port + "/ --proxy-user=" + user_pass.substring(0, user_pass.indexOf("@")) + " --proxy-passwd=" + user_pass.substring(user_pass.indexOf("@") + 1) + " -Y on ";
         
+        // 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 follwoing can (using ps) - actually the environment stuff didn't work for windows, so lets go back to this
+        if (Utility.isWindows()) {
+            command = command + "-e httpproxy=" + proxy_host + ":" + proxy_port + "/ --proxy-user=" + user_pass.substring(0, user_pass.indexOf("@")) + " --proxy-passwd=" + user_pass.substring(user_pass.indexOf("@") + 1) + " -Y on ";
+        } 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+"/";
+        }
+
         }
         else {