Skip to content

Commit cc2f693

Browse files
committed
bump to 1.2.4
1 parent 1de64f6 commit cc2f693

File tree

9 files changed

+46
-33
lines changed

9 files changed

+46
-33
lines changed

README.md

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Unlike many others unofficial clients, it doesn't ask for your 2FA secrets which
6161
Please head to the [release section](https://github.com/Steccas/ProtonClient/releases) to find ready to use installers for Windows, Linux distros and Mac.
6262

6363
## Build
64-
To build this client you need to set up and install [Node.js] and [Nativefier]. Once Node.js is installed, simply run the `npm install` command in the repository's root folder to install Nativefier. Once that's done, you will be able to run the build scripts below.
64+
To build this client you need to set up and install [Node.js]. Once Node.js is installed, simply run the `npm install` command in the repository's root folder to install [Nativefier] and other dependencies. Once that's done, you will be able to run the build scripts below.
6565

6666
You can build it from Windows, Linux, or Mac, but you will need wine or Windows to build it for Windows. Please refer to Nativefier's documentation for more information.
6767

@@ -88,19 +88,23 @@ node .\proton_client_mac.js
8888
I created a small bash script for Linux to make the build faster.
8989
Just run [build.sh](build.sh) from your shell with one of these arguments:
9090
```
91-
--win
91+
./build.sh --win
9292
```
9393
To build for Windows
9494
```
95-
--linux
95+
./build.sh --linux
9696
```
97-
To build for Linux
97+
To build for Linux (optionally creates distribution packages)
9898
```
99-
--mac
99+
./build.sh --mac
100100
```
101101
To build for Mac
102102
```
103-
--all
103+
./build.sh --unix
104+
```
105+
To build for Linux & Mac
106+
```
107+
./build.sh --all
104108
```
105109
To build for all the platforms.
106110

build.sh

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,15 @@ platform=$1
1212

1313
function buildWin {
1414
node ./proton_client_win.js
15+
exit $?
1516
}
1617

1718
function buildLinux {
1819
node ./proton_client_linux.js
1920
while true; do
2021
read -p "Do you wish to create Linux dist packages?" yn
2122
case $yn in
22-
[Yy]* ) distLinux | exit 2;;
23+
[Yy]* ) distLinux; exit $?;;
2324
[Nn]* ) exit 0;;
2425
* ) echo "Please answer yes or no.";;
2526
esac
@@ -28,22 +29,25 @@ function buildLinux {
2829

2930
function buildMac {
3031
node ./proton_client_mac.js
32+
exit $?
3133
}
3234

3335
function buildUnix {
34-
buildLinux
35-
buildMac
36+
node ./proton_client_linux.js || exit $?
37+
node ./proton_client_mac.js || exit $?
38+
exit 0
3639
}
3740

3841
function buildAll {
39-
buildWin
40-
buildLinux
41-
buildMac
42+
node ./proton_client_win.js || exit $?
43+
node ./proton_client_linux.js || exit $?
44+
node ./proton_client_mac.js || exit $?
45+
exit 0
4246
}
4347

4448
function distLinux {
45-
cd ./dist/linux/
46-
./build_dists_linux.sh
49+
(cd ./dist/linux/ && ./build_dists_linux.sh)
50+
return $?
4751
}
4852

4953
if [ $platform == --win ]
Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
# Changelog
22
- security patches
33
- updated dependencies
4+
- rebuilt with latest nativefier
45

56
If you prefer there are also some build archives, which you can unpack and run where you prefer.
67

@@ -18,33 +19,33 @@ sudo apt remove proton-client
1819
```
1920
Install the deb package using
2021
```
21-
sudo apt install ./proton-client-1.2.3-amd64.deb
22+
sudo apt install ./proton-client-1.2.4-amd64.deb
2223
```
2324
or
2425
```
25-
sudo dpkg -i ./proton-client-1.2.3-amd64.deb
26+
sudo dpkg -i ./proton-client-1.2.4-amd64.deb
2627
```
2728
## RHEL based distros
2829
RPM is not tested because I converted it using alien, so please notify me if there are any problems.
2930

3031
Install using:
3132
```
32-
sudo rpm –i proton-client-1.2.3-2.x86_64.rpm
33+
sudo rpm –i proton-client-1.2.4-2.x86_64.rpm
3334
```
3435

3536
To uninstall:
3637
```
37-
sudo rpm –e proton-client-1.2.3-2.x86_64.rpm
38+
sudo rpm –e proton-client-1.2.4-2.x86_64.rpm
3839
```
3940

4041
## Arch based distros like Manjaro
41-
Download **proton-client-1.2.3-1-x86_64.arch.zip**
42+
Download **proton-client-1.2.4-1-x86_64.arch.zip**
4243
```
43-
unzip proton-client-1.2.3-1-x86_64.arch.zip
44-
sudo pacman -U ./proton-client-1.2.3-1-x86_64.pkg.tar.zst
44+
unzip proton-client-1.2.4-1-x86_64.arch.zip
45+
sudo pacman -U ./proton-client-1.2.4-1-x86_64.pkg.tar.zst
4546
```
4647

4748
I have no time nor patience to publish the package to AUR so any help is welcome.
4849

4950
## Mac
50-
Use one of the archives for Mac (proton-client-1.2.3-mac-x86_64.zip); inside, you will find an app bundle ready to be moved when makes sense to you (probably the app folder) and being run.
51+
Use one of the archives for Mac (proton-client-1.2.4-mac-x86_64.zip); inside, you will find an app bundle ready to be moved when makes sense to you (probably the app folder) and being run.

dist/linux/build_dists_linux.sh

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
#!/bin/bash
22

3-
version=($(jq .version ../../package.json | sed 's/"//g'))
3+
version=$(jq -r .version ../../package.json)
44

5-
echo "Creating packages for version $version"
5+
echo "Creating Debian package for version $version"
66

7+
# Build .deb package
78
chmod -R 755 ./proton-client
89
dpkg-deb --build proton-client
910
mv proton-client.deb proton-client-$version-amd64.deb
10-
sudo debtap -u
11-
debtap ./proton-client-$version-amd64.deb
12-
sudo alien -r ./proton-client-$version-amd64.deb --scripts
13-
zip -rv proton-client-$version-1-x86_64.arch.zip .INSTALL .MTREE .PKGINFO proton-client-$version-1-x86_64.pkg.tar.zst
11+
12+
echo "Successfully created: proton-client-$version-amd64.deb"
13+
echo ""
14+
echo "Note: For other distro formats (RPM, Arch), use native packaging tools:"
15+
echo " - RPM: Use rpmbuild with a .spec file"
16+
echo " - Arch: Use makepkg with a PKGBUILD"
17+
echo " - AppImage: Use appimagetool"
1418

1519
exit 0

dist/linux/proton-client/DEBIAN/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: proton-client
2-
Version: 1.2.3
2+
Version: 1.2.4
33
License: MIT
44
Vendor: Luca Steccanella <steccas@pm.me>
55
Architecture: amd64

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "proton-client",
3-
"version": "1.2.3",
3+
"version": "1.2.4",
44
"dependencies": {
55
"nativefier": "latest"
66
},

proton_client_linux.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var options = {
66
targetUrl: 'https://mail.protonmail.com', // required
77
platform: 'linux', // defaults to the current system
88
arch: 'x64', // defaults to the current system
9-
appVersion: '1.2.3',
9+
appVersion: '1.2.4',
1010
overwrite: true,
1111
asar: false, // see conceal
1212
icon: './icons/icon.png',

proton_client_mac.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var options = {
66
targetUrl: 'https://mail.protonmail.com', // required
77
platform: 'mac', // defaults to the current system
88
arch: 'x64', // defaults to the current system
9-
appVersion: '1.2.2',
9+
appVersion: '1.2.4',
1010
overwrite: true,
1111
asar: false, // see conceal
1212
icon: './icons/icon.icns',

proton_client_win.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var options = { //nativefier -n ProtonMail -a x64 --tray --single-instance --int
66
targetUrl: 'https://mail.protonmail.com', // required
77
platform: 'windows', // defaults to the current system
88
arch: 'x64', // defaults to the current system
9-
appVersion: '1.2.3',
9+
appVersion: '1.2.4',
1010
overwrite: true,
1111
asar: false, // see conceal
1212
icon: './icons/icon.ico',

0 commit comments

Comments
 (0)