From: Harald Hoyer <harald@redhat.com>
Date: Fri, 26 Mar 2021 09:29:16 +0000 (+0100)
Subject: fix(gensplash): shellcheck for modules.d/50gensplash
X-Git-Tag: 054~244
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=91f49acd1cfe4d1228b5f0fa99e87f927c190eb6;p=thirdparty%2Fdracut.git

fix(gensplash): shellcheck for modules.d/50gensplash
---

diff --git a/modules.d/50gensplash/.shchkdir b/modules.d/50gensplash/.shchkdir
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules.d/50gensplash/gensplash-emergency.sh b/modules.d/50gensplash/gensplash-emergency.sh
index 01e639b3b..f21d54af0 100755
--- a/modules.d/50gensplash/gensplash-emergency.sh
+++ b/modules.d/50gensplash/gensplash-emergency.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+# shellcheck disable=SC2034
 CDROOT=0
 . /lib/gensplash-lib.sh
 splash verbose
diff --git a/modules.d/50gensplash/gensplash-newroot.sh b/modules.d/50gensplash/gensplash-newroot.sh
index ed2d421fd..445e91cb8 100755
--- a/modules.d/50gensplash/gensplash-newroot.sh
+++ b/modules.d/50gensplash/gensplash-newroot.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+# shellcheck disable=SC2034
 CDROOT=0
 . /lib/gensplash-lib.sh
 splash set_msg 'Switching to new root'
diff --git a/modules.d/50gensplash/gensplash-pretrigger.sh b/modules.d/50gensplash/gensplash-pretrigger.sh
index e7c954120..038c10bc2 100755
--- a/modules.d/50gensplash/gensplash-pretrigger.sh
+++ b/modules.d/50gensplash/gensplash-pretrigger.sh
@@ -4,6 +4,7 @@ if getargbool 1 rd.splash -d -n rd_NO_SPLASH; then
     info "Starting Gentoo Splash"
 
     [ -x /lib/udev/console_init ] && /lib/udev/console_init /dev/tty0
+    # shellcheck disable=SC2034
     CDROOT=0
     . /lib/gensplash-lib.sh
     splash init
diff --git a/modules.d/50gensplash/module-setup.sh b/modules.d/50gensplash/module-setup.sh
index ee7b64128..bb91d13f5 100755
--- a/modules.d/50gensplash/module-setup.sh
+++ b/modules.d/50gensplash/module-setup.sh
@@ -52,6 +52,7 @@ install() {
         _splash_res=${DRACUT_GENSPLASH_RES}
     elif [[ ${hostonly} ]]; then
         # Settings from config only in hostonly
+        # shellcheck disable=SC1090
         [[ -e $dracutsysrootdir/etc/conf.d/splash ]] && source "$dracutsysrootdir"/etc/conf.d/splash
         [[ ! ${_splash_theme} ]] && _splash_theme=default
         [[ ${_splash_res} ]] && _opts+=" -r ${_splash_res}"
@@ -62,15 +63,15 @@ install() {
 
     dinfo "Installing Gentoo Splash (using the ${_splash_theme} theme)"
 
-    pushd "${initdir}" > /dev/null
+    pushd "${initdir}" > /dev/null || exit
     mv dev dev.old
-    call_splash_geninitramfs "${initdir}" ${_opts} ${_splash_theme} || {
+    call_splash_geninitramfs "${initdir}" "${_opts}" ${_splash_theme} || {
         derror "Could not build splash"
         return 1
     }
     rm -rf dev
     mv dev.old dev
-    popd > /dev/null
+    popd > /dev/null || exit
 
     inst_multiple chvt
     inst /usr/share/splashutils/initrd.splash /lib/gensplash-lib.sh