summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2014-08-18 17:20:22 (EDT)
committer P. J. McDermott <pj@pehjota.net>2014-08-18 17:20:22 (EDT)
commit6c2f0921fb023a02b143bcf81487b89890c539d0 (patch)
treefb7073d9776f35decec22d1fea32881f51d77e00
parent3fca5b14bb30dca5f33108be1048acbc1c733787 (diff)
profile_feeds(): Accept a mirror argument
-rw-r--r--lib/cmd/install.sh14
-rw-r--r--lib/profile.sh9
-rw-r--r--lib/profiles/proteanos.sh12
3 files changed, 19 insertions, 16 deletions
diff --git a/lib/cmd/install.sh b/lib/cmd/install.sh
index 08da39d..ef955c6 100644
--- a/lib/cmd/install.sh
+++ b/lib/cmd/install.sh
@@ -81,15 +81,17 @@ cmd_install_main()
error 2 "$(get_msg 'cmd_install_mkdir_chroot_fail')" "${chroot}"
fi
- cmd_install_find_pkgs "${suite}" "${arch}" "${plat}" "${chroot}"
+ cmd_install_find_pkgs "${mirror}" "${suite}" "${arch}" "${plat}" \
+ "${chroot}"
}
cmd_install_find_pkgs()
{
- local suite="${1}"
- local arch="${2}"
- local plat="${3}"
- local chroot="${4}"
+ local mirror="${1}"
+ local suite="${2}"
+ local arch="${3}"
+ local plat="${4}"
+ local chroot="${5}"
local feed_idx=
local feed=
@@ -104,6 +106,6 @@ cmd_install_find_pkgs()
"${chroot}/.prokit/${feed_idx}.filenames" \
>>"${chroot}/.prokit/packages"
done <<-EOF
- $(profile_feeds "${arch}" "${plat}" "${suite}")
+ $(profile_feeds "${mirror}" "${arch}" "${plat}" "${suite}")
EOF
}
diff --git a/lib/profile.sh b/lib/profile.sh
index 40888ea..3e68ff4 100644
--- a/lib/profile.sh
+++ b/lib/profile.sh
@@ -94,11 +94,12 @@ profile_select_mirror()
profile_feeds()
{
- local arch="${1}"
- local plat="${2}"
- local suite="${3}"
+ local mirror="${1}"
+ local arch="${2}"
+ local plat="${3}"
+ local suite="${4}"
- "prof_${profile}_feeds" "${arch}" "${plat}" "${suite}"
+ "prof_${profile}_feeds" "${mirror}" "${arch}" "${plat}" "${suite}"
}
profile_dep_fields()
diff --git a/lib/profiles/proteanos.sh b/lib/profiles/proteanos.sh
index a7946a5..f45a45e 100644
--- a/lib/profiles/proteanos.sh
+++ b/lib/profiles/proteanos.sh
@@ -89,15 +89,15 @@ prof_proteanos_select_mirror()
prof_proteanos_feeds()
{
- local arch="${1}"
- local plat="${2}"
- local suite="${3}"
- local archive=
+ local mirror="${1}"
+ local arch="${2}"
+ local plat="${3}"
+ local suite="${4}"
local a=
local p=
local s=
- archive='http://files.proteanos.com/pub/proteanos'
+ mirror='http://files.proteanos.com/pub/proteanos'
for a in "${arch}" 'all'; do
for p in "${plat}" 'all'; do
@@ -106,7 +106,7 @@ prof_proteanos_feeds()
"${suite%/*}" "${suite#*/}" \
"${a}" "${p}" "${s}"
printf '%s/feeds/%s/%s/%s/%s/Packages\n' \
- "${archive}" "${suite}" \
+ "${mirror}" "${suite}" \
"${a}" "${p}" "${s}"
done
done