diff options
| -rw-r--r-- | config/global/download_extract.in | 2 | ||||
| -rwxr-xr-x | scripts/crosstool.sh | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/config/global/download_extract.in b/config/global/download_extract.in index 08b66ce..db39e25 100644 --- a/config/global/download_extract.in +++ b/config/global/download_extract.in @@ -136,7 +136,7 @@ endchoice config PROXY_TYPE string default "none" if PROXY_TYPE_NONE - default "HTTP" if PROXY_TYPE_HTTP + default "http" if PROXY_TYPE_HTTP default "socks5" if PROXY_TYPE_SOCKS_5 default "socks4" if PROXY_TYPE_SOCKS_4 diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh index f8b52ef..8066159 100755 --- a/scripts/crosstool.sh +++ b/scripts/crosstool.sh @@ -215,13 +215,14 @@ case "${CT_PROXY_TYPE}" in http_proxy="http://" case "${CT_PROXY_USER}:${CT_PROXY_PASS}" in :) ;; - :*) http_proxy="${http_proxy}:${CT_HTP_PROXY_PASS}@";; - *:) http_proxy="${http_proxy}${CT_HTTP_PROXY_USER}@";; - *:*) http_proxy="${http_proxy}${CT_HTTP_PROXY_USER}:${CT_HTP_PROXY_PASS}@";; + :*) http_proxy="${http_proxy}:${CT_PROXY_PASS}@";; + *:) http_proxy="${http_proxy}${CT_PROXY_USER}@";; + *:*) http_proxy="${http_proxy}${CT_PROXY_USER}:${CT_PROXY_PASS}@";; esac - export http_proxy="${http_proxy}${HTTP_PROXY_HOST}:${HTTP_PROXY_PORT}/" + export http_proxy="${http_proxy}${CT_PROXY_HOST}:${CT_PROXY_PORT}/" export https_proxy="${http_proxy}" export ftp_proxy="${http_proxy}" + CT_DoLog DEBUG "http_proxy='${http_proxy}'" ;; socks?) # Re;ove any lingering config file from any previous run |