diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2017-10-05 12:00:54 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2019-10-19 12:21:53 -0400 |
commit | 4d6cf249203f7c3dfa2a18aaa0d599911ceb5232 (patch) | |
tree | 8d24f1d284c23abed6655fcf45d8a6886f24a2c8 /configs/profile/build.sh | |
parent | db32f78877cfa97e26b82e2bc2f5b66595e41646 (diff) |
make double-quoting paths consistent
Diffstat (limited to 'configs/profile/build.sh')
-rwxr-xr-x | configs/profile/build.sh | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/configs/profile/build.sh b/configs/profile/build.sh index dc4fcd6..8790cad 100755 --- a/configs/profile/build.sh +++ b/configs/profile/build.sh @@ -57,13 +57,13 @@ make_pacman_conf() { # Base installation, plus needed packages (root-image) make_basefs() { - setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" init - setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "memtest86+ mkinitcpio-nfs-utils nbd" install + setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${install_dir} init + setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${install_dir} -p "memtest86+ mkinitcpio-nfs-utils nbd" install } # Additional packages (root-image) make_packages() { - setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -p "$(grep -h -v ^# ${releng_dir}/packages.{both,${arch}})" install + setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${install_dir} -p "$(grep -h -v ^# ${releng_dir}/packages.{both,${arch}})" install } # Copy mkinitcpio parabolaiso hooks and build initramfs (root-image) @@ -76,14 +76,17 @@ make_setup_mkinitcpio() { cp ${initcpio_dir}/install/parabolaiso_kms ${work_dir}/${arch}/root-image/usr/lib/initcpio/install cp ${initcpio_dir}/hooks/parabolaiso_shutdown ${work_dir}/${arch}/root-image/usr/lib/initcpio cp ${releng_dir}/mkinitcpio.conf ${work_dir}/${arch}/root-image/etc/mkinitcpio-parabolaiso.conf - setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run + setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} -C ${pacman_conf} -D ${install_dir} -r 'mkinitcpio -c /etc/mkinitcpio-parabolaiso.conf -k /boot/vmlinuz-linux-libre -g /boot/parabolaiso.img' run } # Customize installation (root-image) make_customize_root_image() { cp -af ${releng_dir}/root-image ${work_dir}/${arch} - iso_version="${iso_version}" setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}/${arch}" -C "${pacman_conf}" -D "${install_dir}" -r '/root/customize_root_image.sh' run + iso_version="${iso_version}" setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/${arch} \ + -C ${pacman_conf} \ + -D ${install_dir} \ + -r '/root/customize_root_image.sh' run rm ${work_dir}/${arch}/root-image/root/customize_root_image.sh } @@ -201,16 +204,16 @@ make_aitab() { # Build all filesystem images specified in aitab (.fs.sfs .sfs) make_prepare() { cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir} - setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" pkglist - setarch ${arch} mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" prepare + setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${install_dir} pkglist + setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${install_dir} prepare rm -rf ${work_dir}/root-image # rm -rf ${work_dir}/${arch}/root-image (if low space, this helps) } # Build ISO make_iso() { - mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" checksum - mkparabolaiso ${verbose} -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso" + mkparabolaiso ${verbose} -w ${work_dir} -D ${install_dir} checksum + mkparabolaiso ${verbose} -w ${work_dir} -D ${install_dir} -L ${iso_label} -o ${out_dir} iso ${iso_name} } if [[ ${EUID} -ne 0 ]]; then @@ -240,6 +243,12 @@ while getopts 'N:V:L:D:w:o:vh' arg; do esac done +iso_label=${iso_label// /} +install_dirname=${install_dirname// /} +work_dir=${work_dir// /} +out_dir=${out_dir// /} +pacman_conf=${pacman_conf// /} + chown -R 0:0 "${releng_dir}/root-image/" mkdir -p ${work_dir} |