mirror of
https://github.com/crosstool-ng/crosstool-ng.git
synced 2025-01-18 18:56:31 +00:00
Fix using HTTP proxy.
/trunk/scripts/crosstool.sh | 9 5 4 0 +++++---- /trunk/config/global/download_extract.in | 2 1 1 0 +- 2 files changed, 6 insertions(+), 5 deletions(-)
This commit is contained in:
parent
135a104338
commit
b44e4e652a
@ -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
|
||||
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user