summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-04-18 08:41:30 (GMT)
committerYann E. MORIN" <yann.morin.1998@anciens.enib.fr>2008-04-18 08:41:30 (GMT)
commitb44e4e652ad5c5a6725a61b559eab1168e5f68cf (patch)
treec699240854cf56e7b41675048477eb514c1e7152 /scripts
parent135a104338c69209de65e610a43d1d3d9f1c6632 (diff)
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(-)
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/crosstool.sh9
1 files changed, 5 insertions, 4 deletions
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