From 60ad81fda45a12677dedf144118db4ec3ee71291 Mon Sep 17 00:00:00 2001 From: Harendra Kumar Date: Sun, 17 Dec 2023 05:00:00 +0530 Subject: [PATCH] Rename HLINTVER to HLINT_VERSION --- .github/workflows/packcheck.yml | 2 +- Changelog.md | 2 +- README.md | 2 +- packcheck.sh | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/packcheck.yml b/.github/workflows/packcheck.yml index a0b7fcc..3f686bf 100644 --- a/.github/workflows/packcheck.yml +++ b/.github/workflows/packcheck.yml @@ -127,7 +127,7 @@ jobs: command: hlint runner: ubuntu-latest pack_options: >- - HLINTVER=3.6.1 + HLINT_VERSION=3.6.1 HLINT_OPTIONS="lint" HLINT_TARGETS="src" diff --git a/Changelog.md b/Changelog.md index 16e9354..83aa829 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,7 +9,7 @@ * Explicit `hlint` command was added. Use `packcheck hlint HLINT_OPTIONS="lint" ...` instead of `packcheck cabal-v2 HLINT_OPTIONS="lint" ...` to run hlint on the package. -* `HLINTVER` env var can be used to install a specific version of hlint instead +* `HLINT_VERSION` env var can be used to install a specific version of hlint instead of using one in PATH. * Removed GHCJS, coveralls support * Removed `CABAL_HACKAGE_MIRROR` env var diff --git a/README.md b/README.md index 60b203f..8d37024 100644 --- a/README.md +++ b/README.md @@ -295,7 +295,7 @@ CABALVER : [a.b.c.d] Cabal version (prefix) to use STACKVER : [a.b.c.d] Stack version (prefix) to use STACK_UPGRADE : [y] DESTRUCTIVE! Upgrades stack to latest version RESOLVER : Stack resolver to use for stack builds or cabal builds using stack -HLINTVER : Download a specific version binary of hlint instead of using one in PATH +HLINT_VERSION : Download a specific version binary of hlint instead of using one in PATH -------------------------------------------------- Where to find the required tools diff --git a/packcheck.sh b/packcheck.sh index 99e3347..a835e68 100755 --- a/packcheck.sh +++ b/packcheck.sh @@ -221,7 +221,7 @@ SAFE_ENVVARS="\ CABAL_BUILD_TARGETS \ COVERAGE \ COVERALLS_OPTIONS \ - HLINTVER \ + HLINT_VERSION \ HLINT_BUILD \ HLINT_COMMANDS \ HLINT_OPTIONS \ @@ -360,7 +360,7 @@ show_help() { help_envvar STACKVER "[a.b.c.d] Stack version (prefix) to use" help_envvar STACK_UPGRADE "[y] DESTRUCTIVE! Upgrades stack to latest version" help_envvar RESOLVER "Stack resolver to use for stack builds or cabal builds using stack" - help_envvar HLINTVER "Download a specific version binary of hlint instead of using one in PATH" + help_envvar HLINT_VERSION "Download a specific version binary of hlint instead of using one in PATH" help_envvar DOCSPEC_VERSION "Download a specific version binary of docspec instead of using one in PATH" show_step1 "Where to find the required tools" @@ -1646,9 +1646,9 @@ install_hlint() { fi local PACKAGE=hlint - VERSION=$HLINTVER + VERSION=$HLINT_VERSION - echo "Installing hlint version $HLINTVER" + echo "Installing hlint version $HLINT_VERSION" URL="https://github.com/ndmitchell/$PACKAGE/releases/download/v$VERSION/hlint-$VERSION-x86_64-$OS$EXT" TEMP=$(mktemp -d .$PACKAGE-XXXXXX) @@ -1995,7 +1995,7 @@ then # Also, we need to initialize COMPILER variable before this which is # done in verify_build_config happening after this. build_hlint - elif test -n "$HLINTVER" + elif test -n "$HLINT_VERSION" then install_hlint fi