From: Darshaka Pathirana <dpat@syn-net.org>
Date: Fri, 5 Mar 2021 16:47:28 +0000 (+0100)
Subject: usr_share/run-welcome: Fix a couple of shellcheck warnings
X-Git-Tag: v2.11.0~1^2~5
X-Git-Url: http://git.grml.org/?p=grml-scripts.git;a=commitdiff_plain;h=41dd2c5a3e4dff8789a7f6110f70b298f1cd7d2b

usr_share/run-welcome: Fix a couple of shellcheck warnings

- Ignore SC1091: Not following: /etc/grml/sh-lib was not specified as input (see shellcheck -x).
- SC2046: Quote this to prevent word splitting.
- SC2230: which is non-standard. Use builtin 'command -v' instead.
- SC2086: Double quote to prevent globbing and word splitting.
- SC2230: which is non-standard. Use builtin 'command -v' instead.
---

diff --git a/usr_share/run-welcome b/usr_share/run-welcome
index de46a1f..265301e 100755
--- a/usr_share/run-welcome
+++ b/usr_share/run-welcome
@@ -6,6 +6,7 @@
 # License:       This file is licensed under the GPL v2.
 ################################################################################
 
+# shellcheck disable=SC1091
 . /etc/grml/sh-lib
 
 [ -r /etc/grml_version ] && GRMLVERSION=$(cat /etc/grml_version) || GRMLVERSION='(no version information available)'
@@ -26,7 +27,7 @@ case "$CMDLINE" in
    # allow customized startup via bootoption startup:
    *startup=*)
        script="$(getBootParam startup)"
-       if [ -x $(which $script) ] ; then
+       if [ -x "$(command -v "$script")" ] ; then
           $script
        fi
        ;;
@@ -36,7 +37,7 @@ case "$CMDLINE" in
       ;;
    *) # by default run grml-quickconfig, but only if running as root
       if [ "$(id -u)" = "0" ] ; then
-         which grml-quickconfig &>/dev/null && grml-quickconfig
+         command -v grml-quickconfig &>/dev/null && grml-quickconfig
       fi
 esac