Skip to content

Commit

Permalink
usr_share/run-welcome: Fix a couple of shellcheck warnings
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
jkirk committed Dec 3, 2021
1 parent 2cfbb39 commit 41dd2c5
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions usr_share/run-welcome
Expand Up @@ -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)'
Expand All @@ -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
;;
Expand All @@ -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

Expand Down

0 comments on commit 41dd2c5

Please sign in to comment.