mirror of
https://github.com/ben-grande/qusal.git
synced 2025-08-06 21:24:13 -04:00
feat: enable all optional shellcheck validations
Make shell a little bit safer with: - add-default-case - check-extra-masked-returns - check-set-e-suppressed - quote-safe-variables - check-unassigned-uppercase Although there are some stylistic decisions for uniformity: - avoid-nullary-conditions - deprecated-which - require-variable-braces
This commit is contained in:
parent
011a71a36d
commit
224312ed42
55 changed files with 343 additions and 219 deletions
|
@ -8,7 +8,9 @@
|
|||
set -eu
|
||||
|
||||
command -v git >/dev/null || { echo "Missing program: git" >&2; exit 1; }
|
||||
cd "$(git rev-parse --show-toplevel)" || exit 1
|
||||
repo_toplevel="$(git rev-parse --show-toplevel)"
|
||||
test -d "${repo_toplevel}" || exit 1
|
||||
unset repo_toplevel
|
||||
./scripts/requires-program.sh salt-lint
|
||||
|
||||
find_tool="$(./scripts/best-program.sh fd fdfind find)"
|
||||
|
@ -18,28 +20,31 @@ test -f "${possible_conf}" && conf="-c ${possible_conf}"
|
|||
|
||||
if test -n "${1-}"; then
|
||||
files=""
|
||||
for f in "$@"; do
|
||||
test -f "$f" || continue
|
||||
for f in "${@}"; do
|
||||
test -f "${f}" || continue
|
||||
extension="${f##*.}"
|
||||
case "$extension" in
|
||||
top|sls) files="$files $f";;
|
||||
case "${extension}" in
|
||||
top|sls) files="${files} ${f}";;
|
||||
*) continue;;
|
||||
esac
|
||||
done
|
||||
test -n "$files" || exit 0
|
||||
test -n "${files}" || exit 0
|
||||
exec salt-lint ${conf} ${files}
|
||||
fi
|
||||
|
||||
case "${find_tool}" in
|
||||
fd|fdfind)
|
||||
files="$(${find_tool} . minion.d/ --e conf)
|
||||
$(${find_tool} . salt/ -d 2 -t f -e sls -e top | sort -d)"
|
||||
conf_files="$(${find_tool} . minion.d/ -e conf)"
|
||||
sls_files="$(${find_tool} . salt/ -d 2 -t f -e sls -e top | sort -d)"
|
||||
files="${conf_files}\n${sls_files}"
|
||||
;;
|
||||
find)
|
||||
files="$(find minion.d/ -type f -name "*.conf")
|
||||
$(find salt/* -maxdepth 2 -type f \( -name '*.sls' -o -name '*.top' \) |
|
||||
sort -d)"
|
||||
conf_files="$(find minion.d/ -type f -name "*.conf")"
|
||||
sls_files="$(find salt/* -maxdepth 2 -type f \
|
||||
\( -name '*.sls' -o -name '*.top' \) | sort -d)"
|
||||
files="${conf_files}\n${sls_files}"
|
||||
;;
|
||||
*) echo "Unsupported find tool" >&2; exit 1;;
|
||||
esac
|
||||
|
||||
exec salt-lint ${conf} ${files}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue