From e537b8c31e89c3caa7e5a6caab28f81c05ce9bd2 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sat, 16 Jan 2021 10:33:43 -0500
Subject: run_installer(): Detect correct arch for plat

---
(limited to 'src')

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}"
--
cgit v0.9.1