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_loop_mnt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'archiso/initcpio/hooks/archiso_loop_mnt') diff --git a/archiso/initcpio/hooks/archiso_loop_mnt b/archiso/initcpio/hooks/archiso_loop_mnt index c32a544..2c607f5 100644 --- a/archiso/initcpio/hooks/archiso_loop_mnt +++ b/archiso/initcpio/hooks/archiso_loop_mnt @@ -1,10 +1,12 @@ #!/bin/ash run_hook () { - # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline() + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() [ -n "${img_label}" ] && img_dev="/dev/disk/by-label/${img_label}" [ -z "${img_flags}" ] && img_flags="defaults" - # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline() + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() if [ -n "${img_dev}" ] && [ -n "${img_loop}" ]; then export mount_handler="archiso_loop_mount_handler" fi @@ -17,7 +19,8 @@ archiso_loop_mount_handler () { msg ":: Setup a loop device from ${img_loop} located at device ${img_dev}" _mnt_dev "${img_dev}" "/run/archiso/img_dev" "-r" "${img_flags}" - # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline() + # shellcheck disable=SC2154 + # defined via initcpio's parse_cmdline() if [ "${copytoram}" != "y" ]; then readlink -f "${img_dev}" >> /run/archiso/used_block_devices fi -- cgit v1.2.3-70-g09d2