Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 9 additions & 10 deletions packcheck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1656,7 +1656,7 @@ determine_build_type() {
echo "No cabal file found but a package.yaml file found"
echo "Generating cabal file from package.yaml"
# Generate cabal file from package.yaml
run_verbose "$STACKCMD query > /dev/null 2>&1"
run_verbose $STACKCMD query > /dev/null 2>&1
else
if test $BUILD = "stack" -a -f "stack.yaml"
then
Expand Down Expand Up @@ -2230,15 +2230,15 @@ your .hlint.ignore file."
found=$(grep "^$i$" .hlint.ignore) || true
if test -z "$found"
then
run_verbose_errexit "hlint $HLINT_OPTIONS $i"
run_verbose_errexit hlint $HLINT_OPTIONS $i
fi
done
done
else
local target
for target in $HLINT_TARGETS
do
run_verbose_errexit "hlint $HLINT_OPTIONS $target"
run_verbose_errexit hlint $HLINT_OPTIONS $target
done
fi
}
Expand Down Expand Up @@ -2267,7 +2267,12 @@ start_hlint() {
die "Use HLINT_VERSION option to install."
fi
run_verbose_errexit hlint --version
run_hlint
if test -n "$BUILD_DEPS_ONLY"
then
echo "hlint: nothing to do (BUILD_DEPS_ONLY=y)"
else
run_hlint
fi
}

install_docspec() {
Expand Down Expand Up @@ -2707,12 +2712,6 @@ then
die "Both [BUILD_DEPS_ONLY] and [BUILD_PACKAGE_ONLY] cannot be set at the same time."
fi

if test "$BUILD" = "hlint" -a -n "$BUILD_PACKAGE_ONLY"
then
show_step "hlint: nothing to do (BUILD_PACKAGE_ONLY=y)"
exit 0
fi

# Note that date, uname, cygpath, rm are used even before this point. This
# informatory so that PATH argument can be cleaned up by looking at where the
# tools are. Anything used in require_cmd can be listed here. But the danger is
Expand Down
Loading