mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-07 23:55:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Fixed.

Browse source
This commit is contained in:
SamTV12345 2024-02-11 00:00:52 +01:00
parent a862d41805
commit f4ef5b4f33
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/bin/buildForWindows.sh
View file

@ -34,7 +34,7 @@ try export GIT_WORK_TREE=${TMP_FOLDER}; git checkout HEAD -f \
try mkdir "${TMP_FOLDER}"/.git try mkdir "${TMP_FOLDER}"/.git
try git rev-parse HEAD >${TMP_FOLDER}/.git/HEAD try git rev-parse HEAD >${TMP_FOLDER}/.git/HEAD
# Disable symlinks to avoid problems with Windows # 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}" try cd "${TMP_FOLDER}"
[ -f src/package.json ] || fatal "failed to copy etherpad to temporary 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 # making the windows package smaller
export NODE_ENV=production export NODE_ENV=production
log "do a normal unix install first..." rm -rf node_modules || true
try ./src/bin/installDeps.sh 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..." log "copy the windows settings template..."
try cp settings.json.template settings.json try cp settings.json.template settings.json
log "resolve symbolic links..." #log "resolve symbolic links..."
try cp -rL node_modules node_modules_resolved #try cp -rL node_modules node_modules_resolved
try rm -rf node_modules #try rm -rf node_modules
try mv node_modules_resolved node_modules #try mv node_modules_resolved node_modules
log "download windows node..." log "download windows node..."
try wget "https://nodejs.org/dist/latest-v20.x/win-x64/node.exe" -O node.exe try wget "https://nodejs.org/dist/latest-v20.x/win-x64/node.exe" -O node.exe

3
src/bin/installDeps.sh
View file

@ -8,6 +8,9 @@ cd "${MY_DIR}/../.." || exit 1
# Source constants and useful functions # Source constants and useful functions
. src/bin/functions.sh . src/bin/functions.sh
is_cmd pnpm || npm install pnpm -g
# Is node installed? # Is node installed?
# Not checking io.js, default installation creates a symbolic link to node # Not checking io.js, default installation creates a symbolic link to node
is_cmd node || fatal "Please install node.js ( https://nodejs.org )" is_cmd node || fatal "Please install node.js ( https://nodejs.org )"