diff --git a/src/scripts/install-pnpm.sh b/src/scripts/install-pnpm.sh index 6eae5e3..35d0fd9 100644 --- a/src/scripts/install-pnpm.sh +++ b/src/scripts/install-pnpm.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + if [[ $EUID == 0 ]]; then export SUDO=""; else export SUDO="sudo"; fi # FUNCTIONS @@ -22,7 +24,7 @@ installation_check () { echo "A different version of pnpm is installed ($(pnpm --version)); removing it" $SUDO rm -rf "$(pnpm store path)" > /dev/null 2>&1 - $SUDO rm -rf $PNPM_HOME > /dev/null 2>&1 + $SUDO rm -rf "$PNPM_HOME" > /dev/null 2>&1 $SUDO npm rm -g pnpm > /dev/null 2>&1 fi fi @@ -36,7 +38,7 @@ installation_check # install pnpm echo "Installing pnpm v$PNPM_ORB_VERSION" -curl --retry 5 -fsSL https://get.pnpm.io/install.sh | env PNPM_VERSION=$PNPM_ORB_VERSION sh - +curl --retry 5 -fsSL https://get.pnpm.io/install.sh | env PNPM_VERSION="$PNPM_ORB_VERSION" sh - # test/verify version echo "Verifying pnpm install" diff --git a/src/scripts/packages/determine-lockfile.sh b/src/scripts/packages/determine-lockfile.sh index c291cd0..32d8df5 100644 --- a/src/scripts/packages/determine-lockfile.sh +++ b/src/scripts/packages/determine-lockfile.sh @@ -14,10 +14,10 @@ elif [ -f "npm-shrinkwrap.json" ]; then cp npm-shrinkwrap.json "$TARGET_DIR"/node-project-lockfile elif [ -f "yarn.lock" ]; then echo "Found yarn.lock file, assuming lockfile" - cp yarn.lock $TARGET_DIR/node-project-lockfile + cp yarn.lock "$TARGET_DIR"/node-project-lockfile elif [ -f "pnpm-lock.yaml" ]; then echo "Found pnpm-lock.yaml file, assuming lockfile" - cp pnpm-lock.yaml $TARGET_DIR/node-project-lockfile + cp pnpm-lock.yaml "$TARGET_DIR"/node-project-lockfile else echo "Found no lockfile, adding empty one" touch "$TARGET_DIR"/node-project-lockfile diff --git a/src/scripts/packages/pnpm-install.sh b/src/scripts/packages/pnpm-install.sh index e9b70fe..7880f64 100644 --- a/src/scripts/packages/pnpm-install.sh +++ b/src/scripts/packages/pnpm-install.sh @@ -1,3 +1,5 @@ +#!/usr/bin/env bash + # Run override ci command if provided, otherwise run default npm install if [[ -n "$PARAM_OVERRIDE_COMMAND" ]]; then echo "Running override package installation command:"