Skip to content

Commit 301396d

Browse files
1 parent 772e5aa commit 301396d

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

turborepo-tests/helpers/setup_integration_test.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ fi
4343

4444
"${TURBOREPO_TESTS_DIR}/helpers/copy_fixture.sh" "${TARGET_DIR}" "${FIXTURE_NAME}" "${TURBOREPO_TESTS_DIR}/integration/fixtures"
4545
"${TURBOREPO_TESTS_DIR}/helpers/setup_git.sh" "${TARGET_DIR}"
46-
. "${TURBOREPO_TESTS_DIR}/helpers/setup_package_manager.sh" "${TARGET_DIR}" "$PACKAGE_MANAGER"
46+
"${TURBOREPO_TESTS_DIR}/helpers/setup_package_manager.sh" "${TARGET_DIR}" "$PACKAGE_MANAGER"
4747
if $INSTALL_DEPS; then
4848
"${TURBOREPO_TESTS_DIR}/helpers/install_deps.sh" "$PACKAGE_MANAGER"
4949
fi

turborepo-tests/helpers/setup_package_manager.sh

+8-9
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,15 @@ pkgManagerName="${pkgManager%%@*}"
2929

3030
# Set the corepack install directory to a temp directory (either prysk temp or provided dir).
3131
# This will help isolate from the rest of the system, especially when running tests on a dev machine.
32-
COREPACK_INSTALL_DIR="${PRYSK_TEMP:-$dir}/corepack"
33-
if [[ "$OSTYPE" == "msys" ]]; then
34-
# Ensure it's a POSIX path so that we can use it as a PATH entry (C:\... -> /c/...)
35-
COREPACK_INSTALL_DIR="$(cygpath -au "$COREPACK_INSTALL_DIR")"
36-
# Ensure corepack uses lowercase .cmd extensions, consistent with node's bundled npm
37-
export PATHEXT="$(echo "$PATHEXT" | tr '[:upper:]' '[:lower:]')"
32+
if [ "$PRYSK_TEMP" == "" ]; then
33+
COREPACK_INSTALL_DIR="$dir/corepack"
34+
mkdir -p "${COREPACK_INSTALL_DIR}"
35+
export PATH=${COREPACK_INSTALL_DIR}:$PATH
36+
else
37+
COREPACK_INSTALL_DIR="${PRYSK_TEMP}/corepack"
38+
mkdir -p "${COREPACK_INSTALL_DIR}"
39+
export PATH=${COREPACK_INSTALL_DIR}:$PATH
3840
fi
39-
mkdir -p "${COREPACK_INSTALL_DIR}"
40-
export PATH=${COREPACK_INSTALL_DIR}:$PATH
41-
4241

4342
# Enable corepack so that the packageManager setting in package.json is respected.
4443
corepack enable $pkgManagerName "--install-directory=${COREPACK_INSTALL_DIR}"

0 commit comments

Comments
 (0)