style: make indent and let shfmt fail again

The bump of removed the `-d` option for `shfmt`. Readd it until upstream
is fixed.

See also:
https://github.com/luizm/action-sh-checker/issues/44
master
Harald Hoyer 2021-05-04 13:02:09 +02:00 committed by Harald Hoyer
parent 0620677238
commit 373eadaa9c
4 changed files with 10 additions and 11 deletions

View File

@ -32,7 +32,7 @@ jobs:
uses: luizm/action-sh-checker@v0.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SHFMT_OPTS: -s # arguments to shfmt.
SHFMT_OPTS: -d -s # arguments to shfmt.
with:
sh_checker_shellcheck_disable: false
sh_checker_comment: true

View File

@ -1770,7 +1770,6 @@ fi

[[ -d $dracutsysrootdir$depmodconfdir ]] || depmodconfdir=/etc/depmod.d


export initdir dracutbasedir \
dracutmodules force_add_dracutmodules add_dracutmodules omit_dracutmodules \
mods_to_load \

View File

@ -149,8 +149,8 @@ enable_evm() {
if [ "$((evm_configured & EVM_INIT_X509))" -ne 0 ]; then
# Older kernels did not support EVM_ALLOW_METADATA_WRITES, try for
# newer ones first that need it when an x509 is used
echo $((evm_configured | EVM_ALLOW_METADATA_WRITES | EVM_ACTIVATION_BITS)) > "${EVMSECFILE}" ||
echo $((evm_configured | EVM_ACTIVATION_BITS)) > "${EVMSECFILE}"
echo $((evm_configured | EVM_ALLOW_METADATA_WRITES | EVM_ACTIVATION_BITS)) > "${EVMSECFILE}" \
|| echo $((evm_configured | EVM_ACTIVATION_BITS)) > "${EVMSECFILE}"
else
echo $((evm_configured | EVM_ACTIVATION_BITS)) > "${EVMSECFILE}"
fi