summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/installer.sh17
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}"