From d13172647dc8e332c858e737766685e7384873fb Mon Sep 17 00:00:00 2001 From: David Zwart Date: Sun, 4 Feb 2024 19:46:28 +0100 Subject: [PATCH] fix: force yarn install, remove from chroot --- .../monsterpi/filesystem/home/pi/scripts/update-fdm-monster.sh | 2 +- src/modules/monsterpi/start_chroot_script | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/modules/monsterpi/filesystem/home/pi/scripts/update-fdm-monster.sh b/src/modules/monsterpi/filesystem/home/pi/scripts/update-fdm-monster.sh index e5afb86..2cee395 100644 --- a/src/modules/monsterpi/filesystem/home/pi/scripts/update-fdm-monster.sh +++ b/src/modules/monsterpi/filesystem/home/pi/scripts/update-fdm-monster.sh @@ -171,7 +171,7 @@ echo "[7b/${ts}] Extracting new dist zip to ${dist_active_path}" # Step 8) Ensure yarn is new, (optional) echo "[8/${ts}] Updating yarn" -npm i -g yarn +npm i --global --force yarn yarn set version berry # Step 9) Ensure the required packages are present with yarn (which is already installed, we're just keeping it fresh) diff --git a/src/modules/monsterpi/start_chroot_script b/src/modules/monsterpi/start_chroot_script index 7b2c621..ebfb1e9 100644 --- a/src/modules/monsterpi/start_chroot_script +++ b/src/modules/monsterpi/start_chroot_script @@ -64,7 +64,6 @@ apt install -y nodejs # Enable yarn/pnpm/npm corepack enable -npm install -g yarn pushd /home/"${BASE_USER}" # Install FDM Monster (this is really slow on QEMU!)