summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-07-15 14:46:29 -0400
committerDavid P <megver83@parabola.nu>2020-07-15 15:01:51 -0400
commitb38c42c31b99073583f92d46dcb90ced56965b85 (patch)
treec1264a2a8ea001d7d581beb60f9b3af2f80c56b9
parent372df2a41d47bb821f7a5879195d176a1d0c4535 (diff)
build.sh: fix some quotiation marks
Signed-off-by: David P <megver83@parabola.nu>
-rwxr-xr-xconfigs/lxde-openrc/build.sh16
-rwxr-xr-xconfigs/releng-openrc/build.sh16
-rwxr-xr-xconfigs/releng/build.sh14
3 files changed, 23 insertions, 23 deletions
diff --git a/configs/lxde-openrc/build.sh b/configs/lxde-openrc/build.sh
index 8a69639..32f74ed 100755
--- a/configs/lxde-openrc/build.sh
+++ b/configs/lxde-openrc/build.sh
@@ -86,10 +86,10 @@ make_basefs() {
make_packages() {
if [ -n "${verbose}" ]; then
arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}/packages.{both,${arch}}"| sed ':a;N;$!ba;s/\n/ /g')" install
+ -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
else
arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}/packages.{both,${arch}}"| sed ':a;N;$!ba;s/\n/ /g')" install
+ -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
fi
}
@@ -166,7 +166,7 @@ make_syslinux() {
s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}"
done
cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/*.c32" "${work_dir}/iso/${install_dir}/boot/syslinux"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux"
cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux"
cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux"
mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux/hdt"
@@ -182,9 +182,9 @@ make_isolinux() {
mkdir -p "${work_dir}/iso/isolinux"
sed "s|%INSTALL_DIR%|${install_dir}|g" \
"${script_path}/isolinux/isolinux.cfg" > "${work_dir}/iso/isolinux/isolinux.cfg"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
}
# Prepare /EFI
@@ -193,7 +193,7 @@ make_efi() {
cp "${work_dir}/x86_64/airootfs/usr/share/refind/refind_x64.efi" \
"${work_dir}/iso/EFI/boot/bootx64.efi"
- cp "${script_path}/efiboot/EFI/boot/refind.conf ${work_dir}/iso/EFI/boot/"
+ cp "${script_path}/efiboot/EFI/boot/refind.conf" "${work_dir}/iso/EFI/boot/"
sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" \
@@ -212,7 +212,7 @@ make_efiboot() {
mkfs.fat -n PARABOLAISO_EFI "${work_dir}/iso/EFI/parabolaiso/efiboot.img"
mkdir -p "${work_dir}/efiboot"
- mount "${work_dir}/iso/EFI/parabolaiso/efiboot.img ${work_dir}/efiboot"
+ mount "${work_dir}/iso/EFI/parabolaiso/efiboot.img" "${work_dir}/efiboot"
mkdir -p "${work_dir}/efiboot/EFI/parabolaiso"
cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz" "${work_dir}/efiboot/EFI/parabolaiso/vmlinuz.efi"
diff --git a/configs/releng-openrc/build.sh b/configs/releng-openrc/build.sh
index a466544..f932098 100755
--- a/configs/releng-openrc/build.sh
+++ b/configs/releng-openrc/build.sh
@@ -85,10 +85,10 @@ make_basefs() {
make_packages() {
if [ -n "${verbose}" ]; then
arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}/packages.{both,${arch}}"| sed ':a;N;$!ba;s/\n/ /g')" install
+ -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
else
arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}/packages.{both,${arch}}"| sed ':a;N;$!ba;s/\n/ /g')" install
+ -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
fi
}
@@ -165,7 +165,7 @@ make_syslinux() {
s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}"
done
cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/*.c32" "${work_dir}/iso/${install_dir}/boot/syslinux"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux"
cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux"
cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux"
mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux/hdt"
@@ -178,9 +178,9 @@ make_isolinux() {
mkdir -p "${work_dir}/iso/isolinux"
sed "s|%INSTALL_DIR%|${install_dir}|g" \
"${script_path}/isolinux/isolinux.cfg" > "${work_dir}/iso/isolinux/isolinux.cfg"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
}
# Prepare /EFI
@@ -189,7 +189,7 @@ make_efi() {
cp "${work_dir}/x86_64/airootfs/usr/share/refind/refind_x64.efi" \
"${work_dir}/iso/EFI/boot/bootx64.efi"
- cp "${script_path}/efiboot/EFI/boot/refind.conf ${work_dir}/iso/EFI/boot/"
+ cp "${script_path}/efiboot/EFI/boot/refind.conf" "${work_dir}/iso/EFI/boot/"
sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
s|%INSTALL_DIR%|${install_dir}|g" \
@@ -208,7 +208,7 @@ make_efiboot() {
mkfs.fat -n PARABOLAISO_EFI "${work_dir}/iso/EFI/parabolaiso/efiboot.img"
mkdir -p "${work_dir}/efiboot"
- mount "${work_dir}/iso/EFI/parabolaiso/efiboot.img ${work_dir}/efiboot"
+ mount "${work_dir}/iso/EFI/parabolaiso/efiboot.img" "${work_dir}/efiboot"
mkdir -p "${work_dir}/efiboot/EFI/parabolaiso"
cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz" "${work_dir}/efiboot/EFI/parabolaiso/vmlinuz.efi"
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index f300c7e..1fc511d 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -85,10 +85,10 @@ make_basefs() {
make_packages() {
if [ -n "${verbose}" ]; then
arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}/packages.{both,${arch}}"| sed ':a;N;$!ba;s/\n/ /g')" install
+ -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
else
arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
- -p "$(grep -h -v '^#' "${script_path}/packages.{both,${arch}}"| sed ':a;N;$!ba;s/\n/ /g')" install
+ -p "$(grep -h -v '^#' "${script_path}"/packages.{both,"${arch}"}| sed ':a;N;$!ba;s/\n/ /g')" install
fi
}
@@ -167,7 +167,7 @@ make_syslinux() {
s|%INSTALL_DIR%|${install_dir}|g" "${_cfg}" > "${work_dir}/iso/${install_dir}/boot/syslinux/${_cfg##*/}"
done
cp "${script_path}/syslinux/splash.png" "${work_dir}/iso/${install_dir}/boot/syslinux"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/*.c32" "${work_dir}/iso/${install_dir}/boot/syslinux"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/"*.c32 "${work_dir}/iso/${install_dir}/boot/syslinux"
cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/lpxelinux.0" "${work_dir}/iso/${install_dir}/boot/syslinux"
cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/memdisk" "${work_dir}/iso/${install_dir}/boot/syslinux"
mkdir -p "${work_dir}/iso/${install_dir}/boot/syslinux/hdt"
@@ -180,9 +180,9 @@ make_isolinux() {
mkdir -p "${work_dir}/iso/isolinux"
sed "s|%INSTALL_DIR%|${install_dir}|g" \
"${script_path}/isolinux/isolinux.cfg" > "${work_dir}/iso/isolinux/isolinux.cfg"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/"
- cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isolinux.bin" "${work_dir}/iso/isolinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/isohdpfx.bin" "${work_dir}/iso/isolinux/"
+ cp "${work_dir}/${arch}/airootfs/usr/lib/syslinux/bios/ldlinux.c32" "${work_dir}/iso/isolinux/"
}
# Prepare /EFI
@@ -211,7 +211,7 @@ make_efiboot() {
mkfs.fat -n PARABOLAISO_EFI "${work_dir}/iso/EFI/parabolaiso/efiboot.img"
mkdir -p "${work_dir}/efiboot"
- mount "${work_dir}/iso/EFI/parabolaiso/efiboot.img ${work_dir}/efiboot"
+ mount "${work_dir}/iso/EFI/parabolaiso/efiboot.img" "${work_dir}/efiboot"
mkdir -p "${work_dir}/efiboot/EFI/parabolaiso"
cp "${work_dir}/iso/${install_dir}/boot/x86_64/vmlinuz" "${work_dir}/efiboot/EFI/parabolaiso/vmlinuz.efi"