style: shfmt pre correction

diff --git a/dracut-bash-completion.sh b/dracut-bash-completion.sh
index 21dac0e11f9d54ae4b066bceec6b5857f3e12fdb..9fbd55589a4950ce21d804aec6f20cfb9c72582b 100644 (file)
--- a/dracut-bash-completion.sh
+++ b/dracut-bash-completion.sh
@@ -32,8 +32,7 @@ _dracut() {
                               --xz --zstd --no-compress --gzip --list-modules --show-modules --keep
                               --printsize --regenerate-all --noimageifnotneeded --early-microcode
                               --no-early-microcode --print-cmdline --reproducible --uefi'
-
-                       [ARG]='-a -m -o -d -I -k -c -L --kver --add --force-add --add-drivers
+                [ARG]='-a -m -o -d -I -k -c -L --kver --add --force-add --add-drivers
                               --omit-drivers --modules --omit --drivers --filesystems --install
                               --fwdir --libdirs --fscks --add-fstab --mount --device --nofscks
                               --kmoddir --conf --confdir --tmpdir --stdlog --compress --prefix

diff --git a/dracut-catimages.sh b/dracut-catimages.sh
index c3c4d094e652facd400111c9759b90716841c23b..a7d7563636601a0e26136f17593a319eda12f903 100755 (executable)
--- a/dracut-catimages.sh
+++ b/dracut-catimages.sh
@@ -30,7 +30,7 @@ derror() {
 }
 
 usage() {
-#                                                       80x25 linebreak here ^
+    #                                                   80x25 linebreak here ^
     cat << EOF
 Usage: $0 [OPTION]... <initramfs> <base image> [<image>...]
 Creates initial ramdisk image by concatenating several images from the command

diff --git a/dracut.sh b/dracut.sh
index cb729f0331238782f3f89135678ac28f72ba5c4e..f716f7bb77a6cd8d7b2788bf4d13657011a74ed7 100755 (executable)
--- a/dracut.sh
+++ b/dracut.sh
@@ -45,7 +45,7 @@ usage() {
         . "$dracutbasedir"/dracut-version.sh
     fi
 
-#                                                       80x25 linebreak here ^
+    #                                                   80x25 linebreak here ^
     cat << EOF
 Usage: $dracut_cmd [OPTION]... [<initramfs> [<kernel-version>]]
 
@@ -71,7 +71,7 @@ long_usage() {
         . "$dracutbasedir"/dracut-version.sh
     fi
 
-#                                                       80x25 linebreak here ^
+    #                                                   80x25 linebreak here ^
     cat << EOF
 Usage: $dracut_cmd [OPTION]... [<initramfs> [<kernel-version>]]
 

diff --git a/lsinitrd-bash-completion.sh b/lsinitrd-bash-completion.sh
index 9532bb79b1944ad28094527288fd4dbfd8425e4a..a86da8683e395066435a34925f95f59081d39fa3 100644 (file)
--- a/lsinitrd-bash-completion.sh
+++ b/lsinitrd-bash-completion.sh
@@ -24,9 +24,8 @@ __contains_word () {
 _lsinitrd() {
         local cur=${COMP_WORDS[COMP_CWORD]} prev=${COMP_WORDS[COMP_CWORD-1]}
         local -A OPTS=(
-                [STANDALONE]='-s --size -h --help'
-
-                       [ARG]='-f --file -k --kver'
+            [STANDALONE]='-s --size -h --help'
+            [ARG]='-f --file -k --kver'
         )
 
         # shellcheck disable=SC2086

diff --git a/modules.d/00systemd/module-setup.sh b/modules.d/00systemd/module-setup.sh
index 16f7f7286814557ce8ee5fc30f29249cac8b86e0..e57da5d94d53b02ed9464df8eb42e75c525bd667 100755 (executable)
--- a/modules.d/00systemd/module-setup.sh
+++ b/modules.d/00systemd/module-setup.sh
@@ -242,7 +242,7 @@ install() {
         rescue.target \
         systemd-ask-password-console.service \
         systemd-ask-password-plymouth.service \
-        ; do
+        ${NULL}; do
         [[ -f "$systemdsystemunitdir"/$i ]] || continue
         $SYSTEMCTL -q --root "$initdir" add-wants "$i" systemd-vconsole-setup.service
     done

diff --git a/modules.d/02systemd-networkd/module-setup.sh b/modules.d/02systemd-networkd/module-setup.sh
index ae853c74eb3e0da187854bda6bb8337baebc51e5..a09ad830df4930d818863c32538cd72ea4770f6a 100755 (executable)
--- a/modules.d/02systemd-networkd/module-setup.sh
+++ b/modules.d/02systemd-networkd/module-setup.sh
@@ -49,17 +49,18 @@ install() {
     # grep '^systemd-timesync:' "$dracutsysrootdir"/etc/group >> "$initdir/etc/group"
 
     _arch=${DRACUT_ARCH:-$(uname -m)}
-    inst_libdir_file {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
+    inst_libdir_file \
+                     {"tls/$_arch/",tls/,"$_arch/",}"libnss_dns.so.*" \
                      {"tls/$_arch/",tls/,"$_arch/",}"libnss_mdns4_minimal.so.*" \
                      {"tls/$_arch/",tls/,"$_arch/",}"libnss_myhostname.so.*" \
                      {"tls/$_arch/",tls/,"$_arch/",}"libnss_resolve.so.*"
 
+    #       systemd-timesyncd.service
     for i in \
         systemd-networkd-wait-online.service \
         systemd-networkd.service \
-        systemd-networkd.socket
-#       systemd-timesyncd.service
-    do
+        systemd-networkd.socket \
+        ${NULL}; do
         $SYSTEMCTL -q --root "$initdir" enable "$i"
     done
 }

diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
index b1cf4ae4db652c0b3a2d39449afbcfa9c65ab14a..0f6ceb6a2b257d5523ba96ee0d0dbf8d8d6f270e 100755 (executable)
--- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
@@ -64,7 +64,12 @@ det_img_fs() {
 
 modprobe squashfs
 CMDLINE=$(getcmdline)
-for arg in $CMDLINE; do case $arg in ro|rw) liverw=$arg ;; esac; done
+for arg in $CMDLINE; do
+    case $arg in
+        ro | rw) liverw=$arg ;;
+    esac
+done
+
 # mount the backing of the live image first
 mkdir -m 0755 -p /run/initramfs/live
 if [ -f $livedev ]; then

diff --git a/modules.d/95iscsi/module-setup.sh b/modules.d/95iscsi/module-setup.sh
index 8bd86d0c7f3c569954fe6c40f0638b4a95422f16..43a1dd9d67bd3534821bd5870182fa16222837c9 100755 (executable)
--- a/modules.d/95iscsi/module-setup.sh
+++ b/modules.d/95iscsi/module-setup.sh
@@ -225,16 +225,16 @@ install() {
                       iscsiadm iscsid
 
         for i in \
-                iscsid.socket \
-                iscsiuio.socket \
-            ; do
+            iscsid.socket \
+            iscsiuio.socket \
+            ${NULL}; do
             $SYSTEMCTL -q --root "$initdir" enable "$i"
         done
-        
+
         for i in \
-                iscsid.service \
-                iscsiuio.service \
-            ; do
+            iscsid.service \
+            iscsiuio.service \
+            ${NULL}; do
             $SYSTEMCTL -q --root "$initdir" add-wants basic.target "$i"
         done
 

diff --git a/modules.d/98dracut-systemd/module-setup.sh b/modules.d/98dracut-systemd/module-setup.sh
index 0e5cd7ab93b894f98fd5e71f0f5dee80a8184621..e0adf992d37d3085cb466c9e40d901b97fe62b11 100755 (executable)
--- a/modules.d/98dracut-systemd/module-setup.sh
+++ b/modules.d/98dracut-systemd/module-setup.sh
@@ -47,7 +47,7 @@ install() {
         dracut-pre-pivot.service \
         dracut-pre-trigger.service \
         dracut-pre-udev.service \
-        ; do
+        ${NULL}; do
         inst_simple "$moddir/${i}" "$systemdsystemunitdir/${i}"
         $SYSTEMCTL -q --root "$initdir" add-wants initrd.target "$i"
     done

diff --git a/test/TEST-02-SYSTEMD/systemd-analyze.sh b/test/TEST-02-SYSTEMD/systemd-analyze.sh
index ff6f02f1f3d3c4be4559566abdbed0b35754a699..05bc8aa4f3b7e6791e92663aff94befe414eb17a 100755 (executable)
--- a/test/TEST-02-SYSTEMD/systemd-analyze.sh
+++ b/test/TEST-02-SYSTEMD/systemd-analyze.sh
@@ -4,12 +4,13 @@ cp /usr/bin/true /usr/bin/man
 
 for i in \
     sysinit.target \
-        basic.target \
-        initrd-fs.target \
-        initrd.target \
-        initrd-switch-root.target \
-        emergency.target \
-        shutdown.target; do
+    basic.target \
+    initrd-fs.target \
+    initrd.target \
+    initrd-switch-root.target \
+    emergency.target \
+    shutdown.target \
+    ${NULL}; do
     if ! systemd-analyze verify $i; then
         warn "systemd-analyze verify $i failed"
         poweroff

diff --git a/test/TEST-04-FULL-SYSTEMD/test.sh b/test/TEST-04-FULL-SYSTEMD/test.sh
index 82e6c01d77a9bcae0ecaa3fd7990c76a1feb2dba..dcd6d0434b3c38e0c348323ff5ceec065b7df078 100755 (executable)
--- a/test/TEST-04-FULL-SYSTEMD/test.sh
+++ b/test/TEST-04-FULL-SYSTEMD/test.sh
@@ -172,9 +172,10 @@ EOF
         # install basic keyboard maps and fonts
         for i in \
             /usr/lib/kbd/consolefonts/eurlatgr* \
-                /usr/lib/kbd/keymaps/{legacy/,/}include/* \
-                /usr/lib/kbd/keymaps/{legacy/,/}i386/include/* \
-                /usr/lib/kbd/keymaps/{legacy/,/}i386/qwerty/us.*; do
+            /usr/lib/kbd/keymaps/{legacy/,/}include/* \
+            /usr/lib/kbd/keymaps/{legacy/,/}i386/include/* \
+            /usr/lib/kbd/keymaps/{legacy/,/}i386/qwerty/us.* \
+            ${NULL}; do
             [[ -f $i ]] || continue
             inst $i
         done

diff --git a/test/TEST-99-RPM/test.sh b/test/TEST-99-RPM/test.sh
index 244bde1accbeb61d39ea1548c55fed585e039625..ec03de07735535df71efe38f8ed261b9b385c3f2 100755 (executable)
--- a/test/TEST-99-RPM/test.sh
+++ b/test/TEST-99-RPM/test.sh
@@ -68,30 +68,30 @@ test_run() {
 #!/bin/bash
 set -x
 export LC_MESSAGES=C
-rpm -Va |& \
-    grep -F \
-       '85-display-manager.preset| /run| /var| /usr/lib/variant| /etc/machine-id| /etc/systemd/system/dbus-org.freedesktop.network1.service| /etc/systemd/system/dbus-org.freedesktop.resolve1.service| /etc/udev/hwdb.bin| /usr/share/info/dir.old' \
-    &> /test.output
-
-find / -xdev -type f -not -path '/var/*' \
-  -not -path '/usr/lib/modules/*/modules.*' \
-  -not -path '/etc/*-' \
-  -not -path '/etc/.pwd.lock' \
-  -not -path '/run/mount/utab' \
-  -not -path '/test.sh' \
-  -not -path '/test.output' \
-  -not -path '/etc/nsswitch.conf.bak' \
-  -not -path '/etc/iscsi/initiatorname.iscsi' \
-  -not -path '/boot/*0-rescue*' \
-  -not -path '/usr/share/mime/*' \
-  -not -path '/etc/crypto-policies/*' \
-  -not -path '/dev/null' \
-  -not -path "/boot/loader/entries/\$(cat /etc/machine-id)-*" \
-  -not -path "/boot/\$(cat /etc/machine-id)/*" \
-  -not -path '/etc/openldap/certs/*' \
-  -not -path '/etc/dnf/*' \
-  -print0 | xargs -0 rpm -qf | \
-  grep -F 'not owned' &>> /test.output || :
+rpm -Va 2>&1 | \\
+    grep -F \\
+           '85-display-manager.preset| /run| /var| /usr/lib/variant| /etc/machine-id| /etc/systemd/system/dbus-org.freedesktop.network1.service| /etc/systemd/system/dbus-org.freedesktop.resolve1.service| /etc/udev/hwdb.bin| /usr/share/info/dir.old' \\
+        &> /test.output
+
+find / -xdev -type f -not -path '/var/*' \\
+    -not -path '/usr/lib/modules/*/modules.*' \\
+    -not -path '/etc/*-' \\
+    -not -path '/etc/.pwd.lock' \\
+    -not -path '/run/mount/utab' \\
+    -not -path '/test.sh' \\
+    -not -path '/test.output' \\
+    -not -path '/etc/nsswitch.conf.bak' \\
+    -not -path '/etc/iscsi/initiatorname.iscsi' \\
+    -not -path '/boot/*0-rescue*' \\
+    -not -path '/usr/share/mime/*' \\
+    -not -path '/etc/crypto-policies/*' \\
+    -not -path '/dev/null' \\
+    -not -path "/boot/loader/entries/\$(cat /etc/machine-id)-*" \\
+    -not -path "/boot/\$(cat /etc/machine-id)/*" \\
+    -not -path '/etc/openldap/certs/*' \\
+    -not -path '/etc/dnf/*' \\
+    -print0 | xargs -0 rpm -qf | \\
+    grep -F 'not owned' &>> /test.output || :
 exit 0
 EOF