1.1 --- a/scripts/crosstool.sh	Thu Apr 17 18:07:26 2008 +0000
     1.2 +++ b/scripts/crosstool.sh	Fri Apr 18 08:41:30 2008 +0000
     1.3 @@ -215,13 +215,14 @@
     1.4      http_proxy="http://"
     1.5      case  "${CT_PROXY_USER}:${CT_PROXY_PASS}" in
     1.6        :)      ;;
     1.7 -      :*)     http_proxy="${http_proxy}:${CT_HTP_PROXY_PASS}@";;
     1.8 -      *:)     http_proxy="${http_proxy}${CT_HTTP_PROXY_USER}@";;
     1.9 -      *:*)    http_proxy="${http_proxy}${CT_HTTP_PROXY_USER}:${CT_HTP_PROXY_PASS}@";;
    1.10 +      :*)     http_proxy="${http_proxy}:${CT_PROXY_PASS}@";;
    1.11 +      *:)     http_proxy="${http_proxy}${CT_PROXY_USER}@";;
    1.12 +      *:*)    http_proxy="${http_proxy}${CT_PROXY_USER}:${CT_PROXY_PASS}@";;
    1.13      esac
    1.14 -    export http_proxy="${http_proxy}${HTTP_PROXY_HOST}:${HTTP_PROXY_PORT}/"
    1.15 +    export http_proxy="${http_proxy}${CT_PROXY_HOST}:${CT_PROXY_PORT}/"
    1.16      export https_proxy="${http_proxy}"
    1.17      export ftp_proxy="${http_proxy}"
    1.18 +    CT_DoLog DEBUG "http_proxy='${http_proxy}'"
    1.19      ;;
    1.20    socks?)
    1.21      # Re;ove any lingering config file from any previous run