diff --git a/would-reformat.sh b/would-reformat.sh index 05d923e..627f574 100755 --- a/would-reformat.sh +++ b/would-reformat.sh @@ -31,16 +31,18 @@ if [[ $file_type = "javascript" || $file_type == "css" || $file_type == "scss" || $file_type = "sh" ]]; then - out=$("$(wfroot "$DIR")"/./prettier.sh "$file" 2>&1 > /dev/null) + set +e out=$("$WF_ROOT"/./prettier.sh "$file" 2>&1 >/dev/null) retval="$?" + set -e success_retval=0 would_reformat_retval=1 syntax_error_retval=2 elif [[ $file_type == "python" ]]; then - out=$("$(wfroot "$DIR")"/./isort-and-black.sh "$file" 2>&1 > /dev/null) + set +e out=$("$WF_ROOT"/./isort-and-black.sh "$file" 2>&1 >/dev/null) retval="$?" + set -e success_retval=0 would_reformat_retval=1 syntax_error_retval=2 @@ -49,8 +51,10 @@ elif [[ $file_type == "golang" ]] ; then would_reformat_retval=1 syntax_error_retval=2 + set +e out=$(gofmt -l "$file") exitval="$?" + set -e if [[ "$exitval" = "$syntax_error_retval" ]] ; then retval="$exitval" @@ -66,8 +70,11 @@ elif [[ $file_type == "dart" ]] ; then # probably others too :( syntax_error_retval=65 + set +e out=$(dart format -o none --set-exit-if-changed "$file") exitval="$?" + set -e + retval="$exitval" else echo -n "ignoring"