From bdf8f4e22d815806c452fe97a03320af87ea1c13 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Tue, 16 Apr 2019 10:39:00 -0400
Subject: feed_download(): Accept base URL, not index URL

---
(limited to 'src')

diff --git a/src/feed.sh b/src/feed.sh
index 1fb3d28..bd2de5f 100644
--- a/src/feed.sh
+++ b/src/feed.sh
@@ -31,17 +31,20 @@ feed_deps=
 
 feed_download()
 {
-	local feed_index="${1}"
+	local base_url="${1}"
 	local use_gzip="${2}"
+	local url=
 	local gzip=
 
 	if ${use_gzip}; then
+		url="${base_url}/Packages.gz"
 		gzip="${GUNZIP}"
 	else
+		url="${base_url}/Packages"
 		gzip=cat
 	fi
 
-	${WGET} -q -O - "${feed_index}" | ${gzip}
+	${WGET} -q -O - "${url}" | ${gzip}
 
 	return 0
 }
diff --git a/src/install.sh b/src/install.sh
index 248c268..a52bcd7 100644
--- a/src/install.sh
+++ b/src/install.sh
@@ -124,7 +124,7 @@ install_find_pkgs()
 		esac
 		printf '%s %s %s\n' "${type}" "${name}" \
 			"${base_url%/Packages*}"  >&${opkg_conf_fd}
-		feed_download "${base_url}" ${gzip} \
+		feed_download "${base_url%/Packages*}" ${gzip} \
 			>"${root}/var/lib/opkg/lists/${name}"
 		install_feed_url="${base_url%/*}"
 		feed_find_pkgs "${root}/var/lib/opkg/lists/${name}" \
--
cgit v0.9.1