diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1ddfb..dcb6b8c4c 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,4 +3,4 @@
-
\ No newline at end of file
+
diff --git a/bin/build-server.sh b/bin/build-server.sh
index a15032fa1..8f909eb20 100755
--- a/bin/build-server.sh
+++ b/bin/build-server.sh
@@ -10,7 +10,7 @@ fi
cd dist
wget https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz
-tar xvfJ node-v${NODE_VERSION}-linux-x64.tar.xz
+tar xfJ node-v${NODE_VERSION}-linux-x64.tar.xz
rm node-v${NODE_VERSION}-linux-x64.tar.xz
cd ..
diff --git a/bin/copy-trilium.sh b/bin/copy-trilium.sh
index 578d8b989..5032aeea5 100755
--- a/bin/copy-trilium.sh
+++ b/bin/copy-trilium.sh
@@ -5,7 +5,7 @@ if [[ $# -eq 0 ]] ; then
exit 1
fi
-npm run webpack
+n exec 12 npm run webpack
DIR=$1
@@ -27,7 +27,7 @@ cp -r electron.js $DIR/
cp webpack-* $DIR/
# run in subshell (so we return to original dir)
-(cd $DIR && npm install --only=prod)
+(cd $DIR && n exec 12 npm install --only=prod)
# cleanup of useless files in dependencies
rm -r $DIR/node_modules/image-q/demo
diff --git a/bin/release.sh b/bin/release.sh
index 80a53f771..78237077c 100755
--- a/bin/release.sh
+++ b/bin/release.sh
@@ -55,47 +55,20 @@ echo "Creating release in GitHub"
EXTRA=
if [[ $TAG == *"beta"* ]]; then
- EXTRA=--pre-release
+ EXTRA=--prerelease
fi
-github-release release \
- --tag $TAG \
- --name "$TAG release" $EXTRA
+echo "$GITHUB_CLI_AUTH_TOKEN" | gh auth login --with-token
-echo "Uploading debian x64 package"
-
-github-release upload \
- --tag $TAG \
- --name "$DEBIAN_X64_BUILD" \
- --file "dist/$DEBIAN_X64_BUILD"
-
-echo "Uploading linux x64 build"
-
-github-release upload \
- --tag $TAG \
- --name "$LINUX_X64_BUILD" \
- --file "dist/$LINUX_X64_BUILD"
-
-echo "Uploading windows x64 build"
-
-github-release upload \
- --tag $TAG \
- --name "$WINDOWS_X64_BUILD" \
- --file "dist/$WINDOWS_X64_BUILD"
-
-echo "Uploading mac x64 build"
-
-github-release upload \
- --tag $TAG \
- --name "$MAC_X64_BUILD" \
- --file "dist/$MAC_X64_BUILD"
-
-echo "Uploading linux x64 server build"
-
-github-release upload \
- --tag $TAG \
- --name "$SERVER_BUILD" \
- --file "dist/$SERVER_BUILD"
+gh release create "$TAG" \
+ --title "$TAG release" \
+ --notes ""
+ $EXTRA \
+ "dist/$DEBIAN_X64_BUILD" \
+ "dist/$LINUX_X64_BUILD" \
+ "dist/$WINDOWS_X64_BUILD" \
+ "dist/$MAC_X64_BUILD" \
+ "dist/$SERVER_BUILD"
echo "Building docker image"
@@ -105,4 +78,4 @@ echo "Pushing docker image to dockerhub"
bin/push-docker-image.sh $VERSION
-echo "Release finished!"
\ No newline at end of file
+echo "Release finished!"
diff --git a/src/public/app/widgets/search_actions/delete_note.js b/src/public/app/widgets/search_actions/delete_note.js
index 9de251a4d..9e996dd4d 100644
--- a/src/public/app/widgets/search_actions/delete_note.js
+++ b/src/public/app/widgets/search_actions/delete_note.js
@@ -5,7 +5,7 @@ const TPL = `
- Delete matched note
+ Delete matched notes
|
diff --git a/src/services/build.js b/src/services/build.js
index 31aecc327..2f2ab8b18 100644
--- a/src/services/build.js
+++ b/src/services/build.js
@@ -1 +1 @@
-module.exports = { buildDate:"2021-04-03T22:37:04+02:00", buildRevision: "ef37a52a06b471e60f9c0f11da704283bbcef6ab" };
+module.exports = { buildDate:"2021-04-18T21:47:45+02:00", buildRevision: "ec36fbd83eb4585115daa0eca6dc6fb6da43d3b1" };
|