diff --git a/.gitignore b/.gitignore index 7de512d..acb2ca6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .devenv/ .direnv/ +.ghcup/ node_modules/ .pre-commit-config.yaml diff --git a/lib/utils.sh b/lib/utils.sh index b442b0b..540c3ac 100755 --- a/lib/utils.sh +++ b/lib/utils.sh @@ -1,5 +1,9 @@ +asdf_plugin_path() { + echo "$(dirname "$(dirname "$0")")" +} + ghcup_bin_dir() { - echo "$ASDF_PLUGIN_PATH/.ghcup/bin" + echo "$(asdf_plugin_path)/.ghcup/bin" } check_ghcup() { @@ -8,7 +12,7 @@ check_ghcup() { curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | env \ BOOTSTRAP_HASKELL_MINIMAL=1 \ BOOTSTRAP_HASKELL_NONINTERACTIVE=1 \ - GHCUP_INSTALL_BASE_PREFIX="$ASDF_PLUGIN_PATH" \ + GHCUP_INSTALL_BASE_PREFIX="$(asdf_plugin_path)" \ sh fi } diff --git a/test/install.bats b/test/install.bats index f9ebba4..3a64bf9 100644 --- a/test/install.bats +++ b/test/install.bats @@ -5,15 +5,12 @@ setup() { load 'test_helper/bats-assert/load' DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )" PATH="$DIR/../bin:$PATH" - export ASDF_PLUGIN_PATH=$(mktemp -dt asdf-plugin-XXXX) export ASDF_INSTALL_PATH=$(mktemp -dt asdf-XXXX) } teardown() { rm -rf "${ASDF_INSTALL_PATH}" unset ASDF_INSTALL_PATH - rm -rf "$ASDF_PLUGIN_PATH" - unset ASDF_PLUGIN_PATH } @test "cabal 3.6.2.0" { diff --git a/test/list-all.bats b/test/list-all.bats index 84215bb..6305f9e 100644 --- a/test/list-all.bats +++ b/test/list-all.bats @@ -5,12 +5,6 @@ setup() { load 'test_helper/bats-assert/load' DIR="$( cd "$( dirname "$BATS_TEST_FILENAME" )" >/dev/null 2>&1 && pwd )" PATH="$DIR/../bin:$PATH" - export ASDF_PLUGIN_PATH=$(mktemp -dt asdf-plugin-XXXX) -} - -teardown() { - rm -rf "$ASDF_PLUGIN_PATH" - unset ASDF_PLUGIN_PATH } @test "cabal" {