Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/configs/releng
diff options
context:
space:
mode:
authorDavid Runge <dvzrv@archlinux.org>2020-06-30 19:35:56 +0200
committerDavid Runge <dvzrv@archlinux.org>2020-06-30 19:35:56 +0200
commit5e43a63b3c28f124db39440fcac31aeea779fe78 (patch)
treef847040df377b31ad95d7aa26ae265cd225c551a /configs/releng
parent511ca9d95d9a120e6d5eec080a23c03453e51856 (diff)
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".
Diffstat (limited to 'configs/releng')
-rwxr-xr-xconfigs/releng/build.sh4
1 files changed, 2 insertions, 2 deletions
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
}