diff options
| -rw-r--r-- | src/install.sh | 22 |
1 files changed, 11 insertions, 11 deletions
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 \ |