From b40fb2ae53427e0fb14514e7929c02246ac298f0 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Thu, 16 Jul 2020 15:49:23 +0300 Subject: Separate custom comments from shellcheck comments Having a shellcheck directive and custom comments in the same line can trigger SC1107 on old versions of shellcheck. --- archiso/initcpio/hooks/archiso_pxe_common | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'archiso/initcpio/hooks/archiso_pxe_common') diff --git a/archiso/initcpio/hooks/archiso_pxe_common b/archiso/initcpio/hooks/archiso_pxe_common index e31903e..bf8e883 100644 --- a/archiso/initcpio/hooks/archiso_pxe_common +++ b/archiso/initcpio/hooks/archiso_pxe_common @@ -11,7 +11,8 @@ run_hook () { if [ -n "${ip}" ]; then if [ -n "${BOOTIF}" ]; then bootif_mac="${BOOTIF#01-}" - # shellcheck disable=SC2169 # ash supports bash-like string replacment + # shellcheck disable=SC2169 + # ash supports bash-like string replacment bootif_mac="${bootif_mac//-/:}" for i in /sys/class/net/*/address; do read -r net_mac < "${i}" @@ -36,7 +37,8 @@ run_hook () { launch_interactive_shell fi - # shellcheck disable=SC1090 # ipconfig generates these files + # shellcheck disable=SC1090 + # ipconfig generates these files . /tmp/net-*.conf export pxeserver="${ROOTSERVER}" @@ -60,7 +62,8 @@ run_latehook () { if [ -n "${ip}" ]; then [ -z "${copy_resolvconf}" ] && copy_resolvconf="y" - # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline() + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() if [ "${copytoram}" = "y" ]; then if [ -n "${bootif_dev}" ]; then ip addr flush dev "${bootif_dev}" -- cgit v1.2.3-54-g00ecf