Merge branch 'weltio-master-patch-55325' of https://gitlab.archlinux.org/weltio/archiso.git

By weltio weltio

move $arch override to before it is used

closes https://gitlab.archlinux.org/archlinux/archiso/-/issues/163

* initial: arch=""
* _read_profile: packages="${profile}/packages.${arch}"
* _set_overrides: [[ -n "$arch" ]] || arch="$(uname -m)"

$arch is not defined in _read_profile if arch is not defined in profiledef.sh and packages is not updated after _set_overrides

[[ -n "$arch" ]] || arch="$(uname -m)" should be moved from _set_overrides to _read_profile.

1 files changed, 1 insertions, 1 deletions

diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index dab6bde..f6b3395 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -1048,6 +1048,7 @@ _read_profile() {
         . "${profile}/profiledef.sh"
 
         # Resolve paths of files that are expected to reside in the profile's directory
+        [[ -n "$arch" ]] || arch="$(uname -m)"
         [[ -n "$packages" ]] || packages="${profile}/packages.${arch}"
         packages="$(realpath -- "${packages}")"
         pacman_conf="$(realpath -- "${pacman_conf}")"
@@ -1155,7 +1156,6 @@ _set_overrides() {
     fi
 
     # Set variables that do not have overrides
-    [[ -n "$arch" ]] || arch="$(uname -m)"
     [[ -n "$airootfs_image_type" ]] || airootfs_image_type="squashfs"
     [[ -n "$iso_name" ]] || iso_name="${app_name}"
 }