From 164000029110227fb94c71ed5e245ffa321df30b Mon Sep 17 00:00:00 2001 From: Panagiotis Papadopoulos Date: Sun, 16 Mar 2025 01:04:17 +0100 Subject: [PATCH] build(build-server): move "build:prepare-dist" call to build-server from copy-trilium in preparation to get rid of the file altogether - rest of the functionality will be merged into copy-dist.ts --- bin/build-server.sh | 6 ++++++ bin/copy-trilium.sh | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/bin/build-server.sh b/bin/build-server.sh index 052a8131b..fc1807ee0 100755 --- a/bin/build-server.sh +++ b/bin/build-server.sh @@ -26,6 +26,12 @@ NODE_VERSION=22.14.0 BUILD_DIR="./build" DIST_DIR="./dist" + +# Trigger the build +echo "Build start" +npm run build:prepare-dist +echo "Build finished" + ./bin/copy-trilium.sh NODE_FILENAME=node-v${NODE_VERSION}-linux-${ARCH} diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index 55c5cf6de..b80c97632 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -10,11 +10,6 @@ if ! [[ $(which npm) ]]; then exit 1 fi -# Trigger the build -echo Build start -npm run build:prepare-dist -echo Build finished - # Patch package.json main sed -i 's|./dist/electron-main.js|electron-main.js|g' "$BUILD_DIR/package.json"