From 148b852d6ee1cfd60959fbd4ae0391eeb66f88f5 Mon Sep 17 00:00:00 2001 From: Vijay A Date: Sat, 23 Apr 2022 08:59:31 -0500 Subject: Upgrade 'sqlite3' Add missing dev dependency '@babel/core' [prep for pnpm] Combine 'prebuild' into 'build' script since pre-scripts automagic is not supported by pnpm [cleanup] Use 'pnpm' instead of 'pnpm run' [cleanup] Clean npm cache after cleaning pnpm since pnpm is also managed within npm [cleanup] Delete '~/.electron-gyp' while cleaning --- scripts/build-unix.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scripts/build-unix.sh') diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh index 872219a8f..07f9f2f81 100755 --- a/scripts/build-unix.sh +++ b/scripts/build-unix.sh @@ -63,13 +63,15 @@ if [ "$CLEAN" != "true" ]; then printf "\n*************** SKIPPING Cleaning ***************\n" else printf "\n*************** Cleaning!!!!!! ***************\n" - npm cache clean --force - rm -rf ~/.npm ~/.node-gyp ~/.asdf/installs/nodejs/*/.npm/ + if [[ -s 'pnpm-lock.yaml' ]]; then pnpm store prune || true # in case the pnpm executable itself is not present rm -rf ~/.pnpm-store ~/.pnpm-state fi + npm cache clean --force + rm -rf ~/.npm ~/.node-gyp ~/.electron-gyp ~/.asdf/installs/nodejs/*/.npm/ + git -C recipes clean -fxd # Clean recipes folder/submodule git clean -fxd # Note: This will blast away the 'recipes' folder if you have symlinked it fi @@ -125,7 +127,7 @@ printf "\n*************** Building recipes ***************\n" # Note: 'recipes' is already using only pnpm - can switch to $BASE_CMD AFTER both repos are using pnpm pushd recipes pnpm i -pnpm run package +pnpm package popd # ----------------------------------------------------------------------------- -- cgit v1.2.3-70-g09d2