Skip to content

Commit 30afc5d

Browse files
committed
Fix error propagation in format-cabal.sh
1 parent 318fadf commit 30afc5d

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

scripts/format-cabal.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ fi
1818
# Check Cabal files with cabal-fmt
1919
echo "Formatting Cabal source files with cabal-fmt version ${cabal_fmt_required_version}"
2020
# shellcheck disable=SC2016
21-
if ! git ls-files --exclude-standard --no-deleted --deduplicate '*.cabal' | xargs -L 1 sh -c 'echo "$0" && cabal-fmt -i "$0"'; then
21+
if ! git ls-files --exclude-standard --no-deleted --deduplicate '*.cabal' | xargs -L 1 sh -c 'echo "$0" && cabal-fmt -c "$0" 2>/dev/null || (cabal-fmt -i "$0" && exit 1)'; then
2222
exit 1
2323
fi

scripts/pre-commit.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ if [ ! "${unstaged_cabal_files}" = "" ]; then
2222
fi
2323

2424
# Run various checks and formatters
25-
./scripts/check-cabal.sh
26-
./scripts/format-cabal.sh
27-
./scripts/format-stylish.sh
25+
./scripts/check-cabal.sh || exit 1
26+
./scripts/format-cabal.sh || exit 1
27+
./scripts/format-stylish.sh || exit 1

0 commit comments

Comments
 (0)