From 85d3c7c533e1485451997122923b5d30390cb42a Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
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.
---
 hooks/archiso | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'hooks/archiso')

diff --git a/hooks/archiso b/hooks/archiso
index 44abb88..7f2f9a7 100644
--- a/hooks/archiso
+++ b/hooks/archiso
@@ -63,7 +63,8 @@ _mnt_sfs() {
     local img_fullname="${img##*/}"
     local sfs_dev
 
-    # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline()
+    # shellcheck disable=SC2154
+    # defined via initcpio's parse_cmdline()
     if [ "${copytoram}" = "y" ]; then
         msg -n ":: Copying squashfs image to RAM..."
         if ! cp -- "${img}" "/run/archiso/copytoram/${img_fullname}" ; then
@@ -129,10 +130,12 @@ run_hook() {
     [ -z "${copytoram_size}" ] && copytoram_size="75%"
     [ -z "${archisobasedir}" ] && archisobasedir="arch"
     [ -z "${dm_snap_prefix}" ] && dm_snap_prefix="arch"
-    # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline()
+    # shellcheck disable=SC2154
+    # defined via initcpio's parse_cmdline()
     [ -z "${archisodevice}" ] && archisodevice="/dev/disk/by-label/${archisolabel}"
     [ -z "${cow_spacesize}" ] && cow_spacesize="256M"
-    # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline()
+    # shellcheck disable=SC2154
+    # defined via initcpio's parse_cmdline()
     if [ -n "${cow_label}" ]; then
         cow_device="/dev/disk/by-label/${cow_label}"
         [ -z "${cow_persistent}" ] && cow_persistent="P"
@@ -163,7 +166,8 @@ archiso_mount_handler() {
         fi
     fi
 
-    # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline()
+    # shellcheck disable=SC2154
+    # defined via initcpio's parse_cmdline()
     if [ "${checksum}" = "y" ]; then
         if [ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sha512" ]; then
             msg -n ":: Self-test requested, please wait..."
@@ -180,7 +184,8 @@ archiso_mount_handler() {
         fi
     fi
 
-    # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline()
+    # shellcheck disable=SC2154
+    # defined via initcpio's parse_cmdline()
     if [ "${verify}" = "y" ]; then
         if [ -f "/run/archiso/bootmnt/${archisobasedir}/${arch}/airootfs.sfs.sig" ]; then
             msg -n ":: Signature verification requested, please wait..."
-- 
cgit v1.2.3-70-g09d2