diff options
| author | P. J. McDermott <pj@pehjota.net> | 2015-05-26 00:45:29 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pj@pehjota.net> | 2015-05-26 00:45:29 (EDT) |
| commit | ecb7de9b4e304faec007f734489e0a025efa70c4 (patch) | |
| tree | 47e38dac8630345acb34b7d471d3d64194cadaec /lib/profile.sh | |
| parent | 3da6f63bdcde6a106b746372aa278ba669aa21d1 (diff) | |
| parent | 83bcfb556cfc36246c99cf92f0bc0ec8a8e6d755 (diff) | |
Merge branch 'master' into feature/installer-integration
Conflicts:
lib/cmd/install.sh
Diffstat (limited to 'lib/profile.sh')
| -rw-r--r-- | lib/profile.sh | 31 |
1 files changed, 10 insertions, 21 deletions
diff --git a/lib/profile.sh b/lib/profile.sh index de2c6a1..44c58a2 100644 --- a/lib/profile.sh +++ b/lib/profile.sh @@ -66,31 +66,20 @@ profile_default_plat() "prof_${profile}_default_plat" } -# TODO: This should pass through to prof_${profile}_validate_archplat(). -profile_validate_archplat() +profile_select_mirror() { - local arch="${1}" - local plat="${2}" - local prof_arch= - local prof_plat= - - while read -r prof_arch prof_plat; do - [ "x${prof_arch}" = 'x' ] && continue - if [ "x${arch}" = "x${prof_arch}" ]; then - if [ "x${plat}" = "x${prof_plat}" ]; then - return 0 - fi - fi - done <<-EOF - $(eval "printf '%s\n' \"\${prof_${profile}_archplats}\"") - EOF - - return 1 + "prof_${profile}_select_mirror" } -profile_select_mirror() +profile_validate_archplat() { - "prof_${profile}_select_mirror" + local mirror="${1}" + local arch="${2}" + local plat="${3}" + local suite="${4}" + + "prof_${profile}_validate_archplat" "${mirror}" "${arch}" "${plat}" \ + "${suite}" } profile_feeds() |