From b699e13aad462d3da325a9bcbfe19a672ddf6a75 Mon Sep 17 00:00:00 2001 From: Greg Soltis Date: Sat, 15 Jul 2023 13:51:27 -0700 Subject: [PATCH 1/2] Set corepack dir for examples --- examples-tests/setup.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/examples-tests/setup.sh b/examples-tests/setup.sh index 730fdff876666..41721845d35b6 100644 --- a/examples-tests/setup.sh +++ b/examples-tests/setup.sh @@ -36,7 +36,13 @@ function set_package_manager() { } # Enable corepack so that when we set the packageManager in package.json it actually makes a diference. -corepack enable +if [ "$PRYSK_TEMP" == "" ]; then + COREPACK_INSTALL_DIR= +else + mkdir -p "${PRYSK_TEMP}/corepack" + COREPACK_INSTALL_DIR="--install-directory=${PRYSK_TEMP}/corepack" +fi +corepack enable "${COREPACK_INSTALL_DIR}" # Set the packageManger version NPM_PACKAGE_MANAGER_VALUE="npm@8.1.2" From a85a30e220efb3e243bb4ca5b037c993357a98da Mon Sep 17 00:00:00 2001 From: Greg Soltis Date: Sat, 15 Jul 2023 22:05:30 -0700 Subject: [PATCH 2/2] Add PATH export --- examples-tests/setup.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/examples-tests/setup.sh b/examples-tests/setup.sh index 41721845d35b6..604817046c11f 100644 --- a/examples-tests/setup.sh +++ b/examples-tests/setup.sh @@ -37,12 +37,14 @@ function set_package_manager() { # Enable corepack so that when we set the packageManager in package.json it actually makes a diference. if [ "$PRYSK_TEMP" == "" ]; then - COREPACK_INSTALL_DIR= + COREPACK_INSTALL_DIR_CMD= else - mkdir -p "${PRYSK_TEMP}/corepack" - COREPACK_INSTALL_DIR="--install-directory=${PRYSK_TEMP}/corepack" + COREPACK_INSTALL_DIR="${PRYSK_TEMP}/corepack" + mkdir -p "${COREPACK_INSTALL_DIR}" + export PATH=${COREPACK_INSTALL_DIR}:$PATH + COREPACK_INSTALL_DIR_CMD="--install-directory=${COREPACK_INSTALL_DIR}" fi -corepack enable "${COREPACK_INSTALL_DIR}" +corepack enable "${COREPACK_INSTALL_DIR_CMD}" # Set the packageManger version NPM_PACKAGE_MANAGER_VALUE="npm@8.1.2"