From f4ef5b4f33c96673d73ad563fba7939eb1bf160e Mon Sep 17 00:00:00 2001
From: SamTV12345 <40429738+samtv12345@users.noreply.github.com>
Date: Sun, 11 Feb 2024 00:00:52 +0100
Subject: [PATCH] Fixed.

---
 src/bin/buildForWindows.sh | 17 ++++++++++-------
 src/bin/installDeps.sh     |  3 +++
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/bin/buildForWindows.sh b/src/bin/buildForWindows.sh
index ee55f34d7..ffba06eb6 100755
--- a/src/bin/buildForWindows.sh
+++ b/src/bin/buildForWindows.sh
@@ -34,7 +34,7 @@ try export GIT_WORK_TREE=${TMP_FOLDER}; git checkout HEAD -f \
 try mkdir "${TMP_FOLDER}"/.git
 try git rev-parse HEAD >${TMP_FOLDER}/.git/HEAD
 # Disable symlinks to avoid problems with Windows
-try pnpm i "${TMP_FOLDER}"/src/node_modules
+#try pnpm i "${TMP_FOLDER}"/src/node_modules
 
 try cd "${TMP_FOLDER}"
 [ -f src/package.json ] || fatal "failed to copy etherpad to temporary folder"
@@ -43,16 +43,19 @@ try cd "${TMP_FOLDER}"
 # making the windows package smaller
 export NODE_ENV=production
 
-log "do a normal unix install first..."
-try ./src/bin/installDeps.sh
+rm -rf node_modules || true
+rm -rf src/node_modules || true
+
+#log "do a normal unix install first..."
+#$(try cd src && ./bin/installDeps.sh)
 
 log "copy the windows settings template..."
 try cp settings.json.template settings.json
 
-log "resolve symbolic links..."
-try cp -rL node_modules node_modules_resolved
-try rm -rf node_modules
-try mv node_modules_resolved node_modules
+#log "resolve symbolic links..."
+#try cp -rL node_modules node_modules_resolved
+#try rm -rf node_modules
+#try mv node_modules_resolved node_modules
 
 log "download windows node..."
 try wget "https://nodejs.org/dist/latest-v20.x/win-x64/node.exe" -O node.exe
diff --git a/src/bin/installDeps.sh b/src/bin/installDeps.sh
index 57ed0d54a..dde000b7c 100755
--- a/src/bin/installDeps.sh
+++ b/src/bin/installDeps.sh
@@ -8,6 +8,9 @@ cd "${MY_DIR}/../.." || exit 1
 # Source constants and useful functions
 . src/bin/functions.sh
 
+is_cmd pnpm || npm install pnpm -g
+
+
 # Is node installed?
 # Not checking io.js, default installation creates a symbolic link to node
 is_cmd node || fatal "Please install node.js ( https://nodejs.org )"