Skip to content

Fix CABAL_BINARY_NAME var when CABAL_PATH is specified #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
harendra-kumar merged 1 commit into from
Apr 19, 2026
Merged

Fix CABAL_BINARY_NAME var when CABAL_PATH is specified #118

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
54 changes: 31 additions & 23 deletions packcheck.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1236,6 +1236,17 @@ ensure_node_for_ghcjs() {
fi
}

set_ghc_binary_name() {
COMPILER_BASE_NAME="$(basename "$COMPILER_EXE_PATH_ORIG")"
compiler_in_path="$(which_cmd "$COMPILER_BASE_NAME")"
if test "$compiler_in_path" = "$COMPILER_EXE_PATH_ORIG"
then
COMPILER_EXE_PATH="$COMPILER_BASE_NAME"
else
COMPILER_EXE_PATH="$COMPILER_EXE_PATH_ORIG"
fi
}

find_compiler() {
local found
local compiler_path
Expand Down Expand Up @@ -1304,14 +1315,8 @@ find_compiler() {
compiler_path=$($STACKCMD path --compiler-exe) || exit 1
fi

COMPILER_BASE_NAME="$(basename "$compiler_path")"
compiler_in_path="$(which_cmd "$COMPILER_BASE_NAME")"
if test "$compiler_in_path" = "$compiler_path"
then
COMPILER_EXE_PATH="$COMPILER_BASE_NAME"
else
COMPILER_EXE_PATH="$compiler_path"
fi
COMPILER_EXE_PATH_ORIG="$compiler_path"
set_ghc_binary_name
}

run_prefetch() {
Expand Down Expand Up @@ -1379,7 +1384,8 @@ ensure_ghc() {

if test "$REQUIRED_COMPILER" = ghc -a -n "$GHC_PATH"
then
COMPILER_EXE_PATH="$GHC_PATH"
COMPILER_EXE_PATH_ORIG="$GHC_PATH"
set_ghc_binary_name
else
find_compiler
fi
Expand Down Expand Up @@ -1439,6 +1445,17 @@ stack_install_tool () {
cd ../..
}

set_cabal_binary_name() {
CABAL_BASE_NAME="$(basename "$CABAL_EXE_PATH")"
cabal_in_path="$(which_cmd "$CABAL_BASE_NAME")"
if test "$cabal_in_path" = "$CABAL_EXE_PATH"
then
CABAL_BINARY_NAME="$CABAL_BASE_NAME"
else
CABAL_BINARY_NAME="$CABAL_EXE_PATH"
fi
}

find_cabal () {
CABAL_BINARY_NAME=cabal

Expand Down Expand Up @@ -1472,15 +1489,8 @@ find_cabal () {
fi
fi
fi

CABAL_BASE_NAME="$(basename "$CABAL_EXE_PATH")"
cabal_in_path="$(which_cmd "$CABAL_BASE_NAME")"
if test "$cabal_in_path" = "$CABAL_EXE_PATH"
then
CABAL_BINARY_NAME="$CABAL_BASE_NAME"
else
CABAL_BINARY_NAME="$CABAL_EXE_PATH"
fi
# depends on CABAL_EXE_PATH
set_cabal_binary_name
}

show_cabal() {
Expand Down Expand Up @@ -1522,11 +1532,9 @@ ensure_cabal() {

if test -n "$CABAL_PATH"
then
cabal_dir=$(dirname "$CABAL_PATH")
echo "Adding "$cabal_dir" to PATH"
# Add at the end so that it does not add any ghc at the head.
# We add ghc path at the head.
PATH="$PATH:$cabal_dir"
CABAL_EXE_PATH="$CABAL_PATH"
# depends on CABAL_EXE_PATH
set_cabal_binary_name
else
find_cabal
fi
Expand Down
Loading