Changeset 2234 in ProjectBuilder for devel/pb

Timestamp:

Jun 27, 2017, 3:32:10 PM (7 years ago)

Author:

Bruno Cornec

Message:

Adds https_proxy support

File:

• devel/pb/bin/pb (modified) (3 diffs)

devel/pb/bin/pb

@@ -619 +619 @@
  verpmtype default = rpmbootstrap
 
-You may also choose to specify a mirror for the OS packages, and optionally http/ftp proxies.  You can specify the proxies either through environment variables ($http_proxy/$ftp_proxy) or in the configuration file. The configuration file will be used if no corresponding environment variable has been set. For example, for debian and with a local squid proxy:
+You may also choose to specify a mirror for the OS packages, and optionally http/ftp proxies.  You can specify the proxies either through environment variables ($http_proxy/$https_proxy/$ftp_proxy) or in the configuration file. The configuration file will be used if no corresponding environment variable has been set. For example, for debian and with a local squid proxy:
 
  rbsmirrorsrv debian = http://mirrors1.kernel.org/debian/
  http_proxy default = http://localhost:3128/
+ https_proxy default = http://localhost:3128/
  ftp_proxy default = http://localhost:3128/
 
@@ -3389 +3390 @@
         print SCRIPT "export http_proxy=\"$ENV{'http_proxy'}\"\n";
     }
-
+    if (defined $ENV{'https_proxy'}) {
+        print SCRIPT "export https_proxy=\"$ENV{'https_proxy'}\"\n";
+    }
     if (defined $ENV{'ftp_proxy'}) {
         print SCRIPT "export ftp_proxy=\"$ENV{'ftp_proxy'}\"\n";
@@ -3858 +3861 @@
         print SCRIPT << "EOF";
 # Keep proxy configuration while using sudo
-print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}}    env_keep += \\\"http_proxy ftp_proxy\\\"\\n";
-print PBOUT "Defaults:root    env_keep += \\\"http_proxy ftp_proxy\\\"\\n";
+print PBOUT "Defaults:$pbac->{$ENV{'PBPROJ'}}    env_keep += \\\"http_proxy https_proxy ftp_proxy\\\"\\n";
+print PBOUT "Defaults:root    env_keep += \\\"http_proxy https_proxy ftp_proxy\\\"\\n";
 EOF
     }