diff options
| author | Robert Peichaer <rpe@cvs.openbsd.org> | 2018-07-01 21:00:19 +0000 |
|---|---|---|
| committer | Robert Peichaer <rpe@cvs.openbsd.org> | 2018-07-01 21:00:19 +0000 |
| commit | 1d840e5c230a7683884e3fda556aefb7dcfee2bc (patch) | |
| tree | f174f1749d12c019604c947417417aa37f5cf46d | |
| parent | e471460909f0c89af0ec6cf6d2754b8ada67a688 (diff) | |
Comments
| -rw-r--r-- | distrib/miniroot/install.sub | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 311be313d87..3f4cbaf367c 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,5 +1,5 @@ #!/bin/ksh -# $OpenBSD: install.sub,v 1.1071 2018/07/01 20:45:22 rpe Exp $ +# $OpenBSD: install.sub,v 1.1072 2018/07/01 21:00:18 rpe Exp $ # # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org> @@ -71,17 +71,17 @@ usage() { err_exit "usage: ${0##*/} [-a] [-f filename] [-m install | upgrade]" } -# Wait for the ftp process to finish, or be killed after the timeout and -# extract various informations from the ftplist.cgi output. +# Wait for the ftp(1) process started in start_cgiinfo() to end and extract +# various informations from the ftplist.cgi output. wait_cgiinfo() { local _l _s _key _val - # Wait for the ftp(1) process started in start_cgiinfo() to end and - # ensure, there is actual data to extract info from. wait "$CGIPID" 2>/dev/null + + # Ensure, there is actual data to extract info from. [[ -s $CGI_INFO ]] || return - # Extract list of mirror servers from the ftplist.cgi output. + # Extract the list of mirror servers. sed -En 's,^https?://([[A-Za-z0-9:_][]A-Za-z0-9:._-]*),\1,p' \ $CGI_INFO >$HTTP_LIST 2>/dev/null |