From dfb5527c2021ab89ec69e2133817b9ce3f3b49e9 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Tue, 16 Apr 2019 10:35:32 -0400
Subject: install_find_pkgs(): Rename variables

---
(limited to 'src')

diff --git a/src/install.sh b/src/install.sh
index 693c311..248c268 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -94,9 +94,9 @@ install_find_pkgs()
 	local root="${5}"
 	local opkg_conf_fd=
 	local pkgs_fd=
-	local opt=
-	local feed_idx=
-	local feed=
+	local type=
+	local name=
+	local base_url=
 	local gzip=
 	local pkgs=
 
@@ -116,18 +116,18 @@ install_find_pkgs()
 	fi
 	pkgs_fd=${FD}
 
-	while read -r opt feed_idx feed; do
-		case "${opt}" in
+	while read -r type name base_url; do
+		case "${type}" in
 			'src') gzip=false;;
 			'src/gz') gzip=true;;
 			*) continue;;
 		esac
-		printf '%s %s %s\n' "${opt}" "${feed_idx}" \
-			"${feed%/Packages*}"  >&${opkg_conf_fd}
-		feed_download "${feed}" ${gzip} \
-			>"${root}/var/lib/opkg/lists/${feed_idx}"
-		install_feed_url="${feed%/*}"
-		feed_find_pkgs "${root}/var/lib/opkg/lists/${feed_idx}" \
+		printf '%s %s %s\n' "${type}" "${name}" \
+			"${base_url%/Packages*}"  >&${opkg_conf_fd}
+		feed_download "${base_url}" ${gzip} \
+			>"${root}/var/lib/opkg/lists/${name}"
+		install_feed_url="${base_url%/*}"
+		feed_find_pkgs "${root}/var/lib/opkg/lists/${name}" \
 			"$(profile_dep_fields)" profile_include_pkg \
 			install_deps_cb install_fname_cb \
 			install_md5sum_cb install_sha256sum_cb \
--
cgit v0.9.1