diff --git a/bin/build.sh b/bin/build.sh index 902cde7f71..041cfb09eb 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -8,9 +8,15 @@ cp -r ../trilium-node-binaries/sqlite/* node_modules/sqlite3/lib/binding/ cp -r ../trilium-node-binaries/scrypt/* node_modules/scrypt/bin/ -./node_modules/.bin/electron-rebuild +./node_modules/.bin/electron-rebuild --arch=ia32 -./node_modules/.bin/electron-packager . --out=dist --platform=linux,win32 --overwrite +./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=ia32 --overwrite + +./node_modules/.bin/electron-rebuild --arch=x64 + +./node_modules/.bin/electron-packager . --out=dist --platform=linux --arch=x64 --overwrite + +./node_modules/.bin/electron-packager . --out=dist --platform=win32 --arch=x64 --overwrite # can't copy this before the packaging because the same file name is used for both linux and windows build cp ../trilium-node-binaries/scrypt.node ./dist/trilium-win32-x64/resources/app/node_modules/scrypt/build/Release/ diff --git a/bin/package.sh b/bin/package.sh index f8f5e68069..892be70811 100755 --- a/bin/package.sh +++ b/bin/package.sh @@ -4,8 +4,11 @@ VERSION=`jq -r ".version" package.json` cd dist -echo "Packaging windows electron distribution..." -7z a trilium-windows-${VERSION}.7z trilium-win32-x64 +echo "Packaging linux x64 electron distribution..." +7z a trilium-linux-x64-${VERSION}.7z trilium-linux-x64 -echo "Packaging linux electron distribution..." -7z a trilium-linux-${VERSION}.7z trilium-linux-x64 +echo "Packaging linux ia32 electron distribution..." +7z a trilium-linux-ia32-${VERSION}.7z trilium-linux-ia32 + +echo "Packaging windows x64 electron distribution..." +7z a trilium-windows-x64-${VERSION}.7z trilium-win32-x64 \ No newline at end of file diff --git a/bin/release.sh b/bin/release.sh index 58037eede5..54feb31ee3 100755 --- a/bin/release.sh +++ b/bin/release.sh @@ -44,8 +44,9 @@ bin/build.sh bin/package.sh -LINUX_BUILD=trilium-linux-$VERSION.7z -WINDOWS_BUILD=trilium-windows-$VERSION.7z +LINUX_X64_BUILD=trilium-linux-x64-$VERSION.7z +LINUX_IA32_BUILD=trilium-linux-ia32-$VERSION.7z +WINDOWS_X64_BUILD=trilium-windows-x64-$VERSION.7z echo "Creating release in GitHub" @@ -53,18 +54,25 @@ github-release release \ --tag $TAG \ --name "$TAG release" -echo "Uploading linux build" +echo "Uploading linux x64 build" github-release upload \ --tag $TAG \ - --name "$LINUX_BUILD" \ - --file "dist/$LINUX_BUILD" + --name "$LINUX_X64_BUILD" \ + --file "dist/$LINUX_X64_BUILD" -echo "Uploading windows build" +echo "Uploading linux ia32 build" github-release upload \ --tag $TAG \ - --name "$WINDOWS_BUILD" \ - --file "dist/$WINDOWS_BUILD" + --name "$LINUX_IA32_BUILD" \ + --file "dist/$LINUX_IA32_BUILD" + +echo "Uploading windows x64 build" + +github-release upload \ + --tag $TAG \ + --name "$WINDOWS_X64_BUILD" \ + --file "dist/$WINDOWS_X64_BUILD" echo "Release finished!" \ No newline at end of file diff --git a/index.js b/index.js index 71c1279a21..3a0d86174f 100644 --- a/index.js +++ b/index.js @@ -21,6 +21,7 @@ function createMainWindow() { const win = new electron.BrowserWindow({ width: 1200, height: 900, + title: 'Trilium Notes', icon: path.join(__dirname, 'public/images/app-icons/png/256x256.png') });