Verified Commit f8225782 authored by nl6720's avatar nl6720
Browse files

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 #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.
parents e2e4f3d6 74261924
Pipeline #15105 failed with stages
in 7 minutes and 38 seconds
......@@ -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}"
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment