From 0d06d5cceee44fc869ff58f7228b65e3ab2a40af Mon Sep 17 00:00:00 2001 From: zadam Date: Sun, 4 Dec 2022 23:49:16 +0100 Subject: [PATCH] dump-db should not contain node_modules in release artifacts --- bin/build-linux-x64.sh | 1 + bin/build-mac-x64.sh | 1 + bin/build-server.sh | 1 + bin/build-win-x64.sh | 1 + bin/copy-trilium.sh | 3 --- 5 files changed, 4 insertions(+), 3 deletions(-) diff --git a/bin/build-linux-x64.sh b/bin/build-linux-x64.sh index 68d67a8b5..6e2cf87bc 100755 --- a/bin/build-linux-x64.sh +++ b/bin/build-linux-x64.sh @@ -30,6 +30,7 @@ rm -r $BUILD_DIR/swiftshader cp bin/tpl/anonymize-database.sql $BUILD_DIR/ cp -r dump-db $BUILD_DIR/ +rm -rf $BUILD_DIR/dump-db/node_modules cp bin/tpl/trilium-portable.sh $BUILD_DIR/ chmod 755 $BUILD_DIR/trilium-portable.sh diff --git a/bin/build-mac-x64.sh b/bin/build-mac-x64.sh index fd16cc2a2..0e63c7fb2 100755 --- a/bin/build-mac-x64.sh +++ b/bin/build-mac-x64.sh @@ -26,6 +26,7 @@ mv "./dist/Trilium Notes-darwin-x64" $BUILD_DIR cp bin/tpl/anonymize-database.sql $BUILD_DIR/ cp -r dump-db $BUILD_DIR/ +rm -rf $BUILD_DIR/dump-db/node_modules echo "Zipping mac x64 electron distribution..." diff --git a/bin/build-server.sh b/bin/build-server.sh index 202cb82a3..accb11f32 100755 --- a/bin/build-server.sh +++ b/bin/build-server.sh @@ -31,6 +31,7 @@ chmod 755 $PKG_DIR/trilium.sh cp bin/tpl/anonymize-database.sql $PKG_DIR/ cp -r dump-db $PKG_DIR/ +rm -rf $PKG_DIR/dump-db/node_modules VERSION=`jq -r ".version" package.json` diff --git a/bin/build-win-x64.sh b/bin/build-win-x64.sh index 0f7040a04..9a347a30b 100755 --- a/bin/build-win-x64.sh +++ b/bin/build-win-x64.sh @@ -28,6 +28,7 @@ rm -r $BUILD_DIR/swiftshader cp bin/tpl/anonymize-database.sql $BUILD_DIR/ cp -r dump-db $BUILD_DIR/ +rm -rf $BUILD_DIR/dump-db/node_modules cp bin/tpl/trilium-{portable,no-cert-check,safe-mode}.{bat,ps1} $BUILD_DIR/ diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh index e63ec9442..77f754d17 100755 --- a/bin/copy-trilium.sh +++ b/bin/copy-trilium.sh @@ -14,9 +14,6 @@ mkdir $DIR echo "Copying Trilium to build directory $DIR" -cp -r dump-db $DIR/ -rm -rf $DIR/dump-db/node_modules - cp -r images $DIR/ cp -r libraries $DIR/ cp -r src $DIR/