diff options
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 579cedbbd..ded63027f 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -2015,7 +2015,7 @@ setup_env() { unset $(/usr/bin/env | \ sed -n -e "s/^\([^=[:space:]]\+\)=.*$/\1/p" | \ - egrep -v "^(PTXDIST_PTXRC|PTX_AUTOBUILD_DESTDIR|CCACHE_.*|PWD|HOME|USER|PATH|TERM|COLUMNS|LINES|DISPLAY|http_proxy|ftp_proxy${whitelist})$" ) + egrep -v "^(PTXDIST_PTXRC|PTX_AUTOBUILD_DESTDIR|CCACHE_.*|PWD|HOME|USER|PATH|TERM|COLUMNS|LINES|DISPLAY|http_proxy|https_proxy|ftp_proxy${whitelist})$" ) ######## the environment is clean now ######## @@ -2155,6 +2155,10 @@ setup_config() { export http_proxy="${PTXCONF_SETUP_HTTP_PROXY}" fi + if [ -n "${PTXCONF_SETUP_HTTPS_PROXY}" ]; then + export https_proxy="${PTXCONF_SETUP_HTTPS_PROXY}" + fi + if [ -n "${PTXCONF_SETUP_FTP_PROXY}" ]; then export ftp_proxy="${PTXCONF_SETUP_FTP_PROXY}" fi |