From 5e43a63b3c28f124db39440fcac31aeea779fe78 Mon Sep 17 00:00:00 2001 From: David Runge Date: Tue, 30 Jun 2020 19:35:56 +0200 Subject: Fixing issues with variable quoting and arrays archiso/mkarchiso: Calls to _pacman() need to be done with multiple parameters (e.g. array) instead of one string, as string splitting is not done in that function anymore. Turning _iso_efi_boot_args from string into an array to have an easier time of passing it to xorriso. Calling xorriso within the if statements instead of providing -quiet via variable. Fixing command_install() to provide packages separately to _pacman() configs/releng/build.sh: Replacing all newlines when retrieving the packages from packages.x86_64 with spaces so they will be properly provided to "mkarchiso install". --- configs/releng/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'configs') diff --git a/configs/releng/build.sh b/configs/releng/build.sh index f85dc07..6573613 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -76,10 +76,10 @@ make_basefs() { make_packages() { if [ -n "${verbose}" ]; then mkarchiso -v -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ - -p "$(grep -h -v '^#' "${script_path}/packages.x86_64")" install + -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install else mkarchiso -w "${work_dir}/x86_64" -C "${work_dir}/pacman.conf" -D "${install_dir}" \ - -p "$(grep -h -v '^#' "${script_path}/packages.x86_64")" install + -p "$(grep -h -v '^#' "${script_path}/packages.x86_64"| sed ':a;N;$!ba;s/\n/ /g')" install fi } -- cgit v1.2.3-54-g00ecf