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

Timestamp:

2017-08-11T18:22:36+12:00 (7 years ago)

Author:

ak19

Message:

1. Previous commit message was incorrect: it wasn't that perl wasn't found that resulted in the open3() failure error message, but that something on the PATH wasn't available to it, possible wget itself. 2. Updating unused DownloadJob.old_callDownload() to have the recently committed changes in callDownload(). 3. Emacs tabbing for recently committed files.

File:

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

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

@@ -111 +111 @@
             // Need to manually specify GSDLHOME and GSDLOS also
             
-            proxy_url = proxy_url.replaceAll("http://","");
-            
-            String [] env = new String[7];
+            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
-                           // see also https://wiki.archlinux.org/index.php/proxy_settings
-            env[2] = "ftp_proxy=ftp://"+proxy_url;
+            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[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");
-            
+            // teach it where the wgetrc file lives, in gs2build/bin/<os>:
+            env[5] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc";
+            // Issue discovered on Windows: If PATH is not made available to perl, so that wget or something else needed by
+            // WgetDownload.pm's open3()  call is not on the PATH, then the perl open() call to run wget fails.
+            // So make PATH available to get open3() working:
+            env[6] = "PATH="+System.getenv("PATH");
+            
             prcs = new SafeProcess(command, env, null);
         }