diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2021-01-16 10:33:43 (EST) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2021-01-16 10:33:43 (EST) |
| commit | e537b8c31e89c3caa7e5a6caab28f81c05ce9bd2 (patch) | |
| tree | a94c19ba8c9307a7bf99375fe6d5f3fe00a38c8a | |
| parent | 561dc43e5b4b303232669903f9db1f318eb476a3 (diff) | |
run_installer(): Detect correct arch for plat
| -rw-r--r-- | src/installer.sh | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/installer.sh b/src/installer.sh index 76c1c42..9891ff3 100644 --- a/src/installer.sh +++ b/src/installer.sh @@ -48,16 +48,23 @@ run_installer() shift 6 local inst= - if [ x"${arch}" = x'' ]; then - arch="$(profile_detect_arch)" + if [ x"${mirror}" = x'' ]; then + mirror="$(profile_select_mirror)" fi + profile_prepare_install "${mirror}" "${suite}" + if [ x"${plat}" = x'' ]; then plat="$(profile_default_plat)" fi - if [ x"${mirror}" = x'' ]; then - mirror="$(profile_select_mirror)" + if [ x"${arch}" = x'' ]; then + arch="$(profile_plat_arches "${plat}")" + case "${arch}" in + *?"${LF}"?*) + # Multiple architectures for platform + arch="$(profile_detect_arch)" + ;; + esac fi - profile_prepare_install "${mirror}" "${suite}" if ! profile_validate_archplat "${arch}" "${plat}"; then error "$(get_msg 'install_bad_archplat')" "${arch}" "${plat}" |