From 37529a96766a5841fc6561acfbfbf42b3d6ff98a Mon Sep 17 00:00:00 2001 From: David Runge Date: Sat, 31 Jul 2021 16:32:48 +0200 Subject: Fix formatting with shfmt {hooks,install,script}/*: Fix formatting in all scripts using shfmt. Replace a few echo calls with printf. --- install/archiso | 8 ++++---- install/archiso_kms | 2 +- install/archiso_loop_mnt | 2 +- install/archiso_pxe_common | 4 ++-- install/archiso_pxe_http | 2 +- install/archiso_pxe_nbd | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'install') diff --git a/install/archiso b/install/archiso index c64e10e..d04e04f 100644 --- a/install/archiso +++ b/install/archiso @@ -19,10 +19,10 @@ build() { add_binary gpg add_binary grep - if command -v pv > /dev/null 2>&1; then - add_binary pv + if command -v pv >/dev/null 2>&1; then + add_binary pv else - warning 'pv not found; falling back to cp for copy to RAM' + warning 'pv not found; falling back to cp for copy to RAM' fi add_file /usr/lib/udev/rules.d/60-cdrom_id.rules @@ -31,6 +31,6 @@ build() { add_file /usr/lib/initcpio/udev/11-dm-initramfs.rules /usr/lib/udev/rules.d/11-dm-initramfs.rules if [[ $ARCHISO_GNUPG_FD ]]; then mkdir -m 0700 -- "$BUILDROOT/gpg" - gpg --homedir "$BUILDROOT/gpg" --import <& "$ARCHISO_GNUPG_FD" + gpg --homedir "$BUILDROOT/gpg" --import <&"$ARCHISO_GNUPG_FD" fi } diff --git a/install/archiso_kms b/install/archiso_kms index 8129127..018f574 100644 --- a/install/archiso_kms +++ b/install/archiso_kms @@ -24,7 +24,7 @@ build() { } help() { - cat << HELPEOF + cat < "$BUILDROOT/etc/nsswitch.conf" + printf "hosts: files dns\n" >"$BUILDROOT/etc/nsswitch.conf" } help() { -cat<