Changeset 31831 for main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java

Timestamp:

2017-07-28T19:56:48+12:00 (7 years ago)

Author:

ak19

Message:

Part of previous commit. GLI needs to pass WGETRC env var down to perl running wget

File:

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

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

@@ -318 +318 @@
             // Specify proxies as environment variables
             // Need to manually specify GSDLHOME and GSDLOS also
-            env = new String[4];
+            env = new String[6];
                     proxy_url = proxy_url.replaceAll("http://","");
             env[0] = "http_proxy=http://"+proxy_url;
-            env[1] = "ftp_proxy=ftp://"+proxy_url;
-            env[2] = "GSDLHOME=" + Configuration.gsdl_path;
-            env[3] = "GSDLOS=" + Gatherer.client_operating_system;
+            env[1] = "https_proxy=http://"+proxy_url; // HTTP protocol for https:// too
+                        // see also https://wiki.archlinux.org/index.php/proxy_settings
+            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>
             prcs = rt.exec(cmd, env); 
         } 
@@ -329 +332 @@
             // Not Windows, but running client with download panel
             // Need to manually specify GSDLHOME and GSDLOS
-            env = new String[2];
+            env = new String[3];
             env[0] = "GSDLHOME=" + Configuration.gsdl_path;
             env[1] = "GSDLOS=" + Gatherer.client_operating_system;
+            env[2] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc"; // teach it where the wgetrc file lives, in gs2build/bin/<os>
             prcs = rt.exec(cmd, env); 
         }
@@ -623 +627 @@
             // Specify proxies as environment variables
             // Need to manually specify GSDLHOME and GSDLOS also
-            env = new String[5];
+            env = new String[6];
                     proxy_url = proxy_url.replaceAll("http://","");
             env[0] = "http_proxy=http://"+proxy_url;
@@ -631 +635 @@
             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>
             prcs = new SafeProcess(cmd, env, null);
         } 
@@ -637 +641 @@
             // Not Windows, but running client with download panel
             // Need to manually specify GSDLHOME and GSDLOS
-            env = new String[2];
+            env = new String[3];
             env[0] = "GSDLHOME=" + Configuration.gsdl_path;
             env[1] = "GSDLOS=" + Gatherer.client_operating_system;
-
+            env[2] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc"; // teach it where the wgetrc file lives, in gs2build/bin/<os>
             prcs = new SafeProcess(cmd, env, null);
         }