Reformat and adapt install_http() to fit to 80 columns.

OK krw@, tb@

1 files changed, 19 insertions, 10 deletions

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 3949e1786c6..e09f99909d8 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/ksh
-#	$OpenBSD: install.sub,v 1.961 2017/02/05 15:39:52 rpe Exp $
+#	$OpenBSD: install.sub,v 1.962 2017/02/05 19:29:32 rpe Exp $
 #
 # Copyright (c) 1997-2015 Todd Miller, Theo de Raadt, Ken Westerback
 # Copyright (c) 2015, Robert Peichaer <rpe@openbsd.org>
@@ -1524,9 +1524,9 @@ install_files() {
 
 # Fetch install sets from an HTTP server possibly using a proxy.
 install_http() {
-	local _f _file_list _prompt _url_base _tls _http_proto _http_server
+	local _f _flist _file_list _prompt _tls _http_proto _http_server
 	local _idx=/tmp/i/index.txt _sha=/tmp/i/SHA256 _sig=/tmp/i/SHA256.sig
-	local _install_url _mirror_url _mirror_srv _mirror_dir
+	local _url_base _install_url _mirror_url _mirror_srv _mirror_dir
 
 	# N.B.: 'http_proxy' is an environment variable used by ftp(1).
 	# DON'T change the name or case!
@@ -1567,7 +1567,10 @@ install_http() {
 			[[ -s $HTTP_LIST ]] || continue
 			# Extract the URL from the mirror server listfile.
 			set -- $(sed -n "${resp}p" $HTTP_LIST)
-			(($# < 1)) && { echo "There is no line $resp."; continue; }
+			if (($# < 1)); then
+				echo "There is no line $resp."
+				continue
+			fi
 			HTTP_SERVER=${1%%/*}
 			# Repeat loop to get user to confirm server address.
 			;;
@@ -1618,7 +1621,8 @@ install_http() {
 
 	# Fetch SHA256.sig to create the list of files to select from.
 	rm -f $_idx $_sha $_sig
-	if ! unpriv -f $_sig ftp -w 15 -VMo $_sig "$_url_base/SHA256.sig" 2>/dev/null; then
+	if ! unpriv -f $_sig \
+		ftp -w 15 -VMo $_sig "$_url_base/SHA256.sig" 2>/dev/null; then
 		case $_tls in
 		force)	$AUTO && exit 1 || return
 			;;
@@ -1626,14 +1630,17 @@ install_http() {
 				return
 			_http_proto=http
 			_url_base="http://$HTTP_SERVER/$HTTP_DIR"
-			unpriv -f $_sig ftp -VMo $_sig "$_url_base/SHA256.sig" 2>/dev/null
+			unpriv -f $_sig ftp -VMo $_sig "$_url_base/SHA256.sig" \
+				2>/dev/null
 			;;
 		esac
 	fi
 
 	# Verify SHA256.sig, write SHA256 and extract the list of files.
-	if unpriv -f $_sha signify -Vep $PUB_KEY -x $_sig -m $_sha >/dev/null 2>&1; then
-		_file_list="SHA256.sig $(sed -n 's/^SHA256 (\(.*\)).*$/\1/p' $_sha)"
+	if unpriv -f $_sha \
+		signify -Vep $PUB_KEY -x $_sig -m $_sha >/dev/null 2>&1; then
+		_file_list="$(sed -n 's/^SHA256 (\(.*\)).*$/\1/p' $_sha)"
+		_file_list="SHA256.sig $_file_list"
 	else
 		echo "Unable to get a verified list of distribution sets."
 		# Deny this server, if it's a mirror without a valid SHA256.sig.
@@ -1646,8 +1653,10 @@ install_http() {
 	# already in _file_list. This allows for a verified list of distribution
 	# sets from SHA256.sig, siteXX sets or the whole set list from index.txt
 	# if SHA256.sig was not found (e.g. self compiled sets).
-	if unpriv -f $_idx ftp -VMo $_idx "$_url_base/index.txt" 2>/dev/null; then
-		for _f in $(sed -En 's/^.* ([a-zA-Z][a-zA-Z0-9._-]+)$/\1/p' $_idx); do
+	if unpriv -f $_idx \
+		ftp -VMo $_idx "$_url_base/index.txt" 2>/dev/null; then
+		_flist=$(sed -En 's/^.* ([a-zA-Z][a-zA-Z0-9._-]+)$/\1/p' $_idx)
+		for _f in $_flist; do
 			! isin "$_f" $_file_list && _file_list="$_file_list $_f"
 		done
 	fi