diff options
author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2003-05-12 18:16:16 +0000 |
---|---|---|
committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2003-05-12 18:16:16 +0000 |
commit | 7bc91ad4b45c3fd22ec6642f59a493ded480eee7 (patch) | |
tree | 910cf04a67a11438567ae53e3a148eebb1d2636a /distrib/miniroot/install.sub | |
parent | 9580a3d36ed41c8a14ee1fb58981419a8f98a34c (diff) |
Fix 'eval' statement in _url_base construction so that we use the
contents of ftp_server_dir or http_server_dir, and not their names.
ftp and http installs now work again.
Diffstat (limited to 'distrib/miniroot/install.sub')
-rw-r--r-- | distrib/miniroot/install.sub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index db7c3d890d0..157c842314c 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.301 2003/05/11 22:07:42 krw Exp $ +# $OpenBSD: install.sub,v 1.302 2003/05/12 18:16:15 krw Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2003 Todd Miller, Theo de Raadt, Ken Westerback @@ -1034,7 +1034,7 @@ install_url() { if [[ $_url_type == ftp && $_ftp_server_login != anonymous ]]; then _url_base=$_url_base$(encode_for_url "$_ftp_server_login"):$(encode_for_url "$_ftp_server_password")@ fi - eval _url_base=$_url_base\$_${_url_type}_server_ip/\$_\${_url_type}_server_dir + eval _url_base=$_url_base\$_${_url_type}_server_ip/\$_${_url_type}_server_dir # Get list of files from the server. if [[ $_url_type == ftp && -z $ftp_proxy ]] ; then |