From: Harald Hoyer <harald@redhat.com>
Date: Tue, 30 Mar 2021 10:20:08 +0000 (+0200)
Subject: fix(TEST RPM): shellcheck
X-Git-Tag: 054~177
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=718ad799ac9f8a5825115f7497ea1a85adf850d8;p=thirdparty%2Fdracut.git

fix(TEST RPM): shellcheck
---

diff --git a/test/TEST-99-RPM/.shchkdir b/test/TEST-99-RPM/.shchkdir
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/TEST-99-RPM/test.sh b/test/TEST-99-RPM/test.sh
index 6108b388f..ee59db329 100755
--- a/test/TEST-99-RPM/test.sh
+++ b/test/TEST-99-RPM/test.sh
@@ -3,6 +3,7 @@
 # This file is part of dracut.
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+# shellcheck disable=SC2034
 TEST_DESCRIPTION="rpm integrity after dracut and kernel install"
 
 test_check() {
@@ -16,7 +17,7 @@ test_run() {
     set -e
     export rootdir=$TESTDIR/root
 
-    mkdir -p $rootdir
+    mkdir -p "$rootdir"
 
     mkdir -p "$rootdir/proc"
     mkdir -p "$rootdir/sys"
@@ -32,8 +33,8 @@ test_run() {
 
     mkdir -p "$rootdir/$TESTDIR"
     cp --reflink=auto -a \
-        "$TESTDIR"/dracut-[0-9]*.$(uname -m).rpm \
-        "$TESTDIR"/dracut-network-[0-9]*.$(uname -m).rpm \
+        "$TESTDIR"/dracut-[0-9]*."$(uname -m)".rpm \
+        "$TESTDIR"/dracut-network-[0-9]*."$(uname -m)".rpm \
         "$rootdir/$TESTDIR/"
     . /etc/os-release
     dnf_or_yum=yum
@@ -43,7 +44,7 @@ test_run() {
         dnf_or_yum_cmd="dnf --allowerasing"
     }
     for ((i = 0; i < 5; i++)); do
-        $dnf_or_yum_cmd -v --nogpgcheck --installroot "$rootdir"/ --releasever "$VERSION_ID" --disablerepo='*' \
+        if $dnf_or_yum_cmd -v --nogpgcheck --installroot "$rootdir"/ --releasever "$VERSION_ID" --disablerepo='*' \
             --enablerepo=fedora --enablerepo=updates --setopt=install_weak_deps=False \
             install -y \
             $dnf_or_yum \
@@ -59,11 +60,9 @@ test_run() {
             mdadm \
             bash \
             iscsi-initiator-utils \
-            "$TESTDIR"/dracut-[0-9]*.$(uname -m).rpm \
-            ${NULL} && break
-        #"$TESTDIR"/dracut-config-rescue-[0-9]*.$(uname -m).rpm \
-        #"$TESTDIR"/dracut-network-[0-9]*.$(uname -m).rpm \
-        #    ${NULL}
+            "$TESTDIR"/dracut-[0-9]*."$(uname -m)".rpm; then
+            break
+        fi
     done
     ((i < 5))
 
@@ -127,4 +126,5 @@ test_cleanup() {
     return 0
 }
 
-. $testdir/test-functions
+# shellcheck disable=SC1090
+. "$testdir"/test-functions