summaryrefslogtreecommitdiff
path: root/configs/releng
diff options
context:
space:
mode:
authorDavid P <megver83@parabola.nu>2020-08-01 18:46:47 -0400
committerDavid P <megver83@parabola.nu>2020-08-01 18:46:47 -0400
commit84c873b8237a911a7d1e23dfa6b6bba1bd166196 (patch)
tree5b544ca736b262ad57d6bce6ccd72e57a9bccfa2 /configs/releng
parentd1f5f254b15945141ba1e09bb82b141835bd334f (diff)
[releng] make it shellcheck-compliant
Signed-off-by: David P <megver83@parabola.nu>
Diffstat (limited to 'configs/releng')
-rwxr-xr-xconfigs/releng/build.sh21
1 files changed, 11 insertions, 10 deletions
diff --git a/configs/releng/build.sh b/configs/releng/build.sh
index c382e33..a87f494 100755
--- a/configs/releng/build.sh
+++ b/configs/releng/build.sh
@@ -18,6 +18,7 @@ arch=$(uname -m)
verbose=""
script_path="$( cd -P "$( dirname "$(readlink -f "$0")" )" && pwd )"
+export arch
umask 0022
_usage ()
@@ -96,10 +97,10 @@ make_packages() {
exec 17<>"${work_dir}/gpgkey"
fi
if [ -n "${verbose}" ]; then
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
+ PARABOLAISO_GNUPG_FD="${gpg_key:+17}" 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
else
- PARABOLAISO_GNUPG_FD="${gpg_key:+17}" arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
+ PARABOLAISO_GNUPG_FD="${gpg_key:+17}" 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
fi
if [[ "${gpg_key}" ]]; then
@@ -120,10 +121,10 @@ make_customize_airootfs() {
if [[ -e "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh" ]]; then
if [ -n "${verbose}" ]; then
- arch="${arch}" mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
+ mkparabolaiso -v -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-r '/root/customize_airootfs.sh' run
else
- arch="${arch}" mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
+ mkparabolaiso -w "${work_dir}/${arch}" -C "${work_dir}/pacman.conf" -D "${install_dir}" \
-r '/root/customize_airootfs.sh' run
fi
rm "${work_dir}/${arch}/airootfs/root/customize_airootfs.sh"
@@ -229,11 +230,11 @@ make_efiboot() {
make_prepare() {
cp -a -l -f "${work_dir}/${arch}/airootfs" "${work_dir}"
if [ -n "${verbose}" ]; then
- arch="${arch}" mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" pkglist
- arch="${arch}" mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
+ mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" pkglist
+ mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
else
- arch="${arch}" mkparabolaiso -w "${work_dir}" -D "${install_dir}" pkglist
- arch="${arch}" mkparabolaiso -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
+ mkparabolaiso -w "${work_dir}" -D "${install_dir}" pkglist
+ mkparabolaiso -w "${work_dir}" -D "${install_dir}" ${gpg_key:+-g ${gpg_key}} prepare
fi
rm -rf "${work_dir}/airootfs"
# rm -rf "${work_dir}/${arch}/airootfs" (if low space, this helps)
@@ -242,10 +243,10 @@ make_prepare() {
# Build ISO
make_iso() {
if [ -n "${verbose}" ]; then
- arch="${arch}" mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
+ mkparabolaiso -v -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
-A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
else
- arch="${arch}" mkparabolaiso -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
+ mkparabolaiso -w "${work_dir}" -D "${install_dir}" -L "${iso_label}" -P "${iso_publisher}" \
-A "${iso_application}" -o "${out_dir}" iso "${iso_name}-${iso_version}-dual.iso"
fi
}