# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1208508090 0
# Node ID 4765aa0bd896213ac0d7477f59b51181e31140f8
# Parent  638655b316cfd8717356c65d8794d346b8688203
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(-)

diff -r 638655b316cf -r 4765aa0bd896 config/global/download_extract.in
--- a/config/global/download_extract.in	Thu Apr 17 21:07:01 2008 +0000
+++ b/config/global/download_extract.in	Fri Apr 18 08:41:30 2008 +0000
@@ -136,7 +136,7 @@
 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 -r 638655b316cf -r 4765aa0bd896 scripts/crosstool.sh
--- a/scripts/crosstool.sh	Thu Apr 17 21:07:01 2008 +0000
+++ b/scripts/crosstool.sh	Fri Apr 18 08:41:30 2008 +0000
@@ -215,13 +215,14 @@
     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