summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-04-16 10:35:32 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-04-16 10:35:32 (EDT)
commitdfb5527c2021ab89ec69e2133817b9ce3f3b49e9 (patch)
tree952498cf3c8b528af2ae84413fa07f360888dc7d
parent2a28f9f1332c06ecde12460d8bc49574e8323c59 (diff)
install_find_pkgs(): Rename variables
-rw-r--r--src/install.sh22
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 \