diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-04-16 10:39:00 (EDT) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2019-04-16 10:39:00 (EDT) |
| commit | bdf8f4e22d815806c452fe97a03320af87ea1c13 (patch) | |
| tree | 55a4712750137812860e5217394afe403317fc27 | |
| parent | dfb5527c2021ab89ec69e2133817b9ce3f3b49e9 (diff) | |
feed_download(): Accept base URL, not index URL
| -rw-r--r-- | src/feed.sh | 7 | ||||
| -rw-r--r-- | src/install.sh | 2 |
2 files changed, 6 insertions, 3 deletions
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}" \ |