Merge pull request #23475 from nabijaczleweli/certified-lint.1-moment

Actually run shellcheck on CI
This commit is contained in:
Frantisek Sumsal 2022-05-23 19:16:22 +00:00 committed by GitHub
commit 40bc68cf21
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions

View file

@ -37,8 +37,9 @@ jobs:
# - man/.* - all snippets in man pages (false positives due to
# missing shebangs)
# - .*\.(in|SKELETON) - all template/skeleton files
# except kernel-install
# - tools/coverity\.sh - external file (with some modifications)
FILTER_REGEX_EXCLUDE: .*/(man/.*|.*\.(in|SKELETON)|tools/coverity\.sh)$
FILTER_REGEX_EXCLUDE: .*/(man/.*|([^k]|k(k|ek)*([^ek]|e[^kr]))*(k(k|ek)*e?)?\.(in|SKELETON)|tools/coverity\.sh)$
VALIDATE_ALL_CODEBASE: false
VALIDATE_BASH: true
# FIXME: temporarily disable validation of GH Action files, since

View file

@ -112,6 +112,7 @@ fi
if [ -n "$install_conf" ]; then
[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo "Reading $install_conf…"
# shellcheck source=/dev/null
. "$install_conf"
# FIXME: This may override configuration in environment variables, e.g. $BOOT_ROOT.
fi
@ -130,6 +131,7 @@ fi
# generated one. If the user configured an explicit machine ID to use in
# /etc/machine-info to use for our purpose, we'll use that instead (for
# compatibility).
# shellcheck source=/dev/null
if [ -z "$MACHINE_ID" ] && [ -r /etc/machine-info ] && . /etc/machine-info && MACHINE_ID="$KERNEL_INSTALL_MACHINE_ID"; then
[ -n "$MACHINE_ID" ] && [ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && \
echo "machine-id $MACHINE_ID acquired from /etc/machine-info"
@ -157,6 +159,7 @@ if [ -z "$ENTRY_TOKEN" ]; then
# the IMAGE_ID= and ID= fields from /etc/os-release and finally the fixed
# string "Default"
ENTRY_TOKEN_SEARCH="$MACHINE_ID"
# shellcheck source=/dev/null
[ -r /etc/os-release ] && . /etc/os-release
[ -n "$IMAGE_ID" ] && ENTRY_TOKEN_SEARCH="$ENTRY_TOKEN_SEARCH $IMAGE_ID"
[ -n "$ID" ] && ENTRY_TOKEN_SEARCH="$ENTRY_TOKEN_SEARCH $ID"
@ -291,7 +294,7 @@ PLUGINS="$(
IFS="
"
[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && echo -e "Plugin files:\n$PLUGINS"
[ "$KERNEL_INSTALL_VERBOSE" -gt 0 ] && printf '%s\n' "Plugin files:" "$PLUGINS"
case "$COMMAND" in
add)

View file

@ -15,7 +15,7 @@ CXX="$6"
# Locate ninja binary, on CentOS 7 it is called ninja-build, so
# use that name if available.
ninja="ninja"
if which ninja-build >/dev/null 2>&1 ; then
if command -v ninja-build >/dev/null ; then
ninja="ninja-build"
fi