Skip to content

Commit

Permalink
Fix shellcheck issues
Browse files Browse the repository at this point in the history
  • Loading branch information
nvtkaszpir committed Jan 11, 2024
1 parent 5ca5a12 commit a040b60
Showing 1 changed file with 19 additions and 19 deletions.
38 changes: 19 additions & 19 deletions hadolint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
# problem-matcher.json to the home folder.

PROBLEM_MATCHER_FILE="/problem-matcher.json"
if [ -f "$PROBLEM_MATCHER_FILE" ]; then
cp "$PROBLEM_MATCHER_FILE" "$HOME/"
if [[ -f "${PROBLEM_MATCHER_FILE}" ]]; then
cp "${PROBLEM_MATCHER_FILE}" "${HOME}/"
fi
# After the run has finished we remove the problem-matcher.json from
# the repository so we don't leave the checkout dirty. We also remove
Expand All @@ -16,52 +16,52 @@ cleanup() {
}
trap cleanup EXIT

echo "::add-matcher::$HOME/problem-matcher.json"
echo "::add-matcher::${HOME}/problem-matcher.json"

if [ -n "$HADOLINT_CONFIG" ]; then
if [[ -n "${HADOLINT_CONFIG}" ]]; then
HADOLINT_CONFIG="-c ${HADOLINT_CONFIG}"
fi

if [ -z "$HADOLINT_TRUSTED_REGISTRIES" ]; then
if [[ -z "${HADOLINT_TRUSTED_REGISTRIES}" ]]; then
unset HADOLINT_TRUSTED_REGISTRIES
fi

COMMAND="hadolint $HADOLINT_CONFIG"
COMMAND="hadolint ${HADOLINT_CONFIG}"

if [ "$HADOLINT_RECURSIVE" = "true" ]; then
if [ "${HADOLINT_RECURSIVE}" = "true" ]; then
shopt -s globstar

filename="${!#}"
flags="${*:1:$#-1}"

RESULTS=$(eval "$COMMAND $flags" -- **/"$filename")
RESULTS=$(eval "${COMMAND} ${flags}" -- **/"${filename}")
else
flags=$*
RESULTS=$(eval "$COMMAND" "$flags")
RESULTS=$(eval "${COMMAND}" "${flags}")
fi
FAILED=$?

if [ -n "$HADOLINT_OUTPUT" ]; then
if [ -f "$HADOLINT_OUTPUT" ]; then
HADOLINT_OUTPUT="$TMP_FOLDER/$HADOLINT_OUTPUT"
if [[ -n "${HADOLINT_OUTPUT}" ]]; then
if [ -f "${HADOLINT_OUTPUT}" ]; then
HADOLINT_OUTPUT="${TMP_FOLDER}/${HADOLINT_OUTPUT}"
fi
echo "$RESULTS" >"$HADOLINT_OUTPUT"
echo "$RESULTS" >"${HADOLINT_OUTPUT}"
fi

RESULTS="${RESULTS//$'\\n'/''}"

{
echo "results<<EOF"
echo "$RESULTS"
echo "${RESULTS}"
echo "EOF"
} >>"$GITHUB_OUTPUT"
} >>"${GITHUB_OUTPUT}"

{
echo "HADOLINT_RESULTS<<EOF"
echo "$RESULTS"
echo "${RESULTS}"
echo "EOF"
} >>"$GITHUB_ENV"
} >>"${GITHUB_ENV}"

[ -z "$HADOLINT_OUTPUT" ] || echo "Hadolint output saved to: $HADOLINT_OUTPUT"
[ -z "${HADOLINT_OUTPUT}" ] || echo "Hadolint output saved to: ${HADOLINT_OUTPUT}"

exit $FAILED
exit ${FAILED}

0 comments on commit a040b60

Please sign in to comment.