diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2014-04-04 19:44:03 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2014-04-04 19:44:03 +0000 |
| commit | fd6f626f2e0b7a02615bb66916d4da45e51ae673 (patch) | |
| tree | afea929e46b67df54d4ba7def15c361c2a20e14c /distrib/miniroot | |
| parent | 9ad7c5763c9c98c8953fbf8e0b6d2a9621e93b09 (diff) | |
Change HTTP_PROXY back to http_proxy. This is an environment variable
for ftp(1) and not an install script global variable.
Pointed out by rpe@, and probably explains M. Lucas's problems of a
few days ago.
ok sthen@ halex@
Diffstat (limited to 'distrib/miniroot')
| -rw-r--r-- | distrib/miniroot/install.sub | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index df11360bf39..98f69aa81c2 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.757 2014/03/22 02:42:00 krw Exp $ +# $OpenBSD: install.sub,v 1.758 2014/04/04 19:44:02 krw Exp $ # # Copyright (c) 1997-2009 Todd Miller, Theo de Raadt, Ken Westerback # All rights reserved. @@ -1373,10 +1373,12 @@ install_http() { local _file_list _prompt _mirror _url_base waitcgiinfo + # N.B.: 'http_proxy' is an environment variable used by ftp(1). DON'T + # change the name or case! ask "HTTP proxy URL? (e.g. 'http://proxy:8080', or 'none')" \ - "${HTTP_PROXY:-none}" - unset HTTP_PROXY - [[ $resp == none ]] || export HTTP_PROXY=$resp + "${http_proxy:-none}" + unset http_proxy + [[ $resp == none ]] || export http_proxy=$resp if [[ -s $HTTP_LIST ]]; then _prompt="Server? (hostname, list#, 'done' or '?')" |