projects
/
grml-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
usr_share/run-welcome: Fix a couple of shellcheck warnings
[grml-scripts.git]
/
usr_share
/
run-welcome
diff --git
a/usr_share/run-welcome
b/usr_share/run-welcome
index
de46a1f
..
265301e
100755
(executable)
--- a/
usr_share/run-welcome
+++ b/
usr_share/run-welcome
@@
-6,6
+6,7
@@
# License: This file is licensed under the GPL v2.
################################################################################
# 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)'
. /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)"
# allow customized startup via bootoption startup:
*startup=*)
script="$(getBootParam startup)"
- if [ -x
$(which $script)
] ; then
+ if [ -x
"$(command -v "$script")"
] ; then
$script
fi
;;
$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
;;
*) # 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
fi
esac