Changeset 31831 for main/trunk/gli/src
- Timestamp:
- 2017-07-28T19:56:48+12:00 (7 years ago)
- Location:
- main/trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gli/src/org/greenstone/gatherer/download/DownloadJob.java
r31823 r31831 318 318 // Specify proxies as environment variables 319 319 // Need to manually specify GSDLHOME and GSDLOS also 320 env = new String[ 4];320 env = new String[6]; 321 321 proxy_url = proxy_url.replaceAll("http://",""); 322 322 env[0] = "http_proxy=http://"+proxy_url; 323 env[1] = "ftp_proxy=ftp://"+proxy_url; 324 env[2] = "GSDLHOME=" + Configuration.gsdl_path; 325 env[3] = "GSDLOS=" + Gatherer.client_operating_system; 323 env[1] = "https_proxy=http://"+proxy_url; // HTTP protocol for https:// too 324 // see also https://wiki.archlinux.org/index.php/proxy_settings 325 env[2] = "ftp_proxy=ftp://"+proxy_url; 326 env[3] = "GSDLHOME=" + Configuration.gsdl_path; 327 env[4] = "GSDLOS=" + Gatherer.client_operating_system; 328 env[5] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc"; // teach it where the wgetrc file lives, in gs2build/bin/<os> 326 329 prcs = rt.exec(cmd, env); 327 330 } … … 329 332 // Not Windows, but running client with download panel 330 333 // Need to manually specify GSDLHOME and GSDLOS 331 env = new String[ 2];334 env = new String[3]; 332 335 env[0] = "GSDLHOME=" + Configuration.gsdl_path; 333 336 env[1] = "GSDLOS=" + Gatherer.client_operating_system; 337 env[2] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc"; // teach it where the wgetrc file lives, in gs2build/bin/<os> 334 338 prcs = rt.exec(cmd, env); 335 339 } … … 623 627 // Specify proxies as environment variables 624 628 // Need to manually specify GSDLHOME and GSDLOS also 625 env = new String[ 5];629 env = new String[6]; 626 630 proxy_url = proxy_url.replaceAll("http://",""); 627 631 env[0] = "http_proxy=http://"+proxy_url; … … 631 635 env[3] = "GSDLHOME=" + Configuration.gsdl_path; 632 636 env[4] = "GSDLOS=" + Gatherer.client_operating_system; 633 637 env[5] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc"; // teach it where the wgetrc file lives, in gs2build/bin/<os> 634 638 prcs = new SafeProcess(cmd, env, null); 635 639 } … … 637 641 // Not Windows, but running client with download panel 638 642 // Need to manually specify GSDLHOME and GSDLOS 639 env = new String[ 2];643 env = new String[3]; 640 644 env[0] = "GSDLHOME=" + Configuration.gsdl_path; 641 645 env[1] = "GSDLOS=" + Gatherer.client_operating_system; 642 646 env[2] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc"; // teach it where the wgetrc file lives, in gs2build/bin/<os> 643 647 prcs = new SafeProcess(cmd, env, null); 644 648 } -
main/trunk/gli/src/org/greenstone/gatherer/download/ServerInfoDialog.java
r31820 r31831 115 115 // Specify proxies as environment variables 116 116 // Need to manually specify GSDLHOME and GSDLOS also 117 env = new String[ 5];117 env = new String[6]; 118 118 proxy_url = proxy_url.replaceAll("http://",""); 119 119 env[0] = "http_proxy=http://"+proxy_url; … … 123 123 env[3] = "GSDLHOME=" + Configuration.gsdl_path; 124 124 env[4] = "GSDLOS=" + Gatherer.client_operating_system; 125 env[5] = "WGETRC=" + LocalGreenstone.getBinOSDirectoryPath(Gatherer.client_operating_system)+"wgetrc"; // teach it where the wgetrc file lives, in gs2build/bin/<os> 125 126 prcs = new SafeProcess(command, env, null); 126 127 } -
main/trunk/gli/src/org/greenstone/gatherer/greenstone/LocalGreenstone.java
r13594 r31831 44 44 return gsdl_directory_path + "bin" + File.separator + "script" + File.separator; 45 45 } 46 46 47 static public String getBinOSDirectoryPath(String operatingSystem) 48 { 49 return gsdl_directory_path + "bin" + File.separator + operatingSystem + File.separator; 50 } 51 47 52 48 53 static public String getDirectoryPath()
Note:
See TracChangeset
for help on using the changeset viewer.