Replace previous PKGBUILD with a proper one

Use system electron, build from sources.

5 files changed, 71 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 318a7967e631..5a9bd0676cae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = protonmail-desktop
 	pkgdesc = Unofficial app that emulates a native client for the ProtonMail e-mail service
-	pkgver = 0.5.4
+	pkgver = 0.5.8
 	pkgrel = 1
-	url = https://github.com/protonmail-desktop/application
+	url = http://protondesktop.com/
 	arch = any
-	license = GPL3
-	depends = gconf
-	provides = protonmail-desktop
-	source = https://github.com/protonmail-desktop/application/releases/download/v0.5.4/protonmail-desktop-0.5.4.tar.gz
-	source = https://i.imgur.com/hySaVZp.png
+	license = MIT
+	makedepends = npm
+	depends = electron
+	options = !strip
+	source = protonmail-desktop-0.5.8.tar.gz::https://github.com/protonmail-desktop/application/archive/v0.5.8.tar.gz
+	source = protonmail-desktop.sh
 	source = protonmail-desktop.desktop
-	source = protonmail-desktop
-	md5sums = 515731f7f255ae3605f5ca013b14420e
-	md5sums = 3cd502ea0bdb20f99cc8a018084746d4
-	md5sums = 738f1086d70031a262aacf329de0d06c
-	md5sums = 6edb6dd0aad1511978dca145114e87b7
+	sha256sums = ed9ef67d5444cc6d1da949843ca5b92ae5f0cb02d34a172a08dfaffae0fd26ae
+	sha256sums = f830633b18a59b7d2a7787e9f0b4d8de802522e0c7732d1032ced354ab861532
+	sha256sums = 4482041b9daabaf1ad4225e775cdb694078f1e17d026a3f9dbe72731b3bbec0d
 
 pkgname = protonmail-desktop
 
diff --git a/PKGBUILD b/PKGBUILD
index 5053de8d8806..b67769938611 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,59 @@
-# Maintainer: givemeurhats <givemeurhats [at] gmail [dot] com>
+# $Id$
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=protonmail-desktop
-pkgver=0.5.4
+pkgver=0.5.8
 pkgrel=1
 pkgdesc="Unofficial app that emulates a native client for the ProtonMail e-mail service"
-url="https://github.com/protonmail-desktop/application"
-license=('GPL3')
-arch=('any')
-provides=('protonmail-desktop')
-depends=('gconf')
-source=(https://github.com/protonmail-desktop/application/releases/download/v0.5.4/protonmail-desktop-0.5.4.tar.gz
-        https://i.imgur.com/hySaVZp.png
-        protonmail-desktop.desktop
-        protonmail-desktop)
-md5sums=('515731f7f255ae3605f5ca013b14420e'
-         '3cd502ea0bdb20f99cc8a018084746d4'
-         '738f1086d70031a262aacf329de0d06c'
-         '6edb6dd0aad1511978dca145114e87b7')
+arch=(any)
+url="http://protondesktop.com/"
+license=(MIT)
+depends=(electron)
+makedepends=(npm)
+options=(!strip)
+source=($pkgname-$pkgver.tar.gz::https://github.com/protonmail-desktop/application/archive/v$pkgver.tar.gz
+        $pkgname.sh
+        $pkgname.desktop)
+sha256sums=('ed9ef67d5444cc6d1da949843ca5b92ae5f0cb02d34a172a08dfaffae0fd26ae'
+            'f830633b18a59b7d2a7787e9f0b4d8de802522e0c7732d1032ced354ab861532'
+            '4482041b9daabaf1ad4225e775cdb694078f1e17d026a3f9dbe72731b3bbec0d')
+
+build() {
+  cd application-$pkgver
+  sed -i '/"postinstall"/d' package.json
+  sed -i '/initiateAutoUpdater/d' src/background.js
+  npm uninstall eslint gulp-sass --save
+  npm install eslint gulp-sass --save-dev
+  npm run build
+  npm prune --production
+}
 
 package() {
-  mkdir -p ${pkgdir}/opt/protonmail-desktop/icons
-  mkdir -p ${pkgdir}/usr/bin
-  mkdir -p ${pkgdir}/usr/share/applications
-  cp -R ${srcdir}/protonmail-desktop-${pkgver}/* ${pkgdir}/opt/protonmail-desktop/
-  cp ${srcdir}/protonmail-desktop ${pkgdir}/usr/bin/
-  cp ${srcdir}/hySaVZp.png ${pkgdir}/opt/protonmail-desktop/icons/protonmail-desktop.png
-  chmod +x ${pkgdir}/usr/bin/protonmail-desktop
-  cp ${srcdir}/protonmail-desktop.desktop ${pkgdir}/usr/share/applications/
+  mkdir -p "$pkgdir"/usr/{lib,share/pixmaps}
+  cp -r application-$pkgver "$pkgdir/usr/lib/$pkgname"
+  ln -s ../../lib/$pkgname/app/static/Icon.png "$pkgdir/usr/share/pixmaps/$pkgname.png"
+  install -Dm755 $pkgname.sh "$pkgdir/usr/bin/$pkgname"
+  install -Dm644 $pkgname.desktop "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 application-$pkgver/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+
+  # Clean up
+  find "$pkgdir/usr/lib/$pkgname/node_modules" \
+      -name "package.json" \
+        -exec sed -e "s|$srcdir/$pkgname|/usr/lib/$pkgname|" \
+            -i {} \; \
+      -or -name ".*" -prune -exec rm -r '{}' \; \
+      -or -name "*.gyp" -prune -exec rm -r '{}' \; \
+      -or -name "*.gypi" -prune -exec rm -r '{}' \; \
+      -or -name "*.mk" -prune -exec rm -r '{}' \; \
+      -or -name "*Makefile" -prune -exec rm -r '{}' \; \
+      -or -name "bin" -prune -exec rm -r '{}' \; \
+      -or -name "deps" -prune -exec rm -r '{}' \; \
+      -or -name "doc" -prune -exec rm -r '{}' \; \
+      -or -name "example" -prune -exec rm -r '{}' \; \
+      -or -name "man" -prune -exec rm -r '{}' \; \
+      -or -name "nan" -prune -exec rm -r '{}' \; \
+      -or -name "obj.target" -prune -exec rm -r '{}' \; \
+      -or -name "script" -prune -exec rm -r '{}' \; \
+      -or -name "test" -prune -exec rm -r '{}' \; \
+      -or -name "tmp" -prune -exec rm -r '{}' \;
 }
diff --git a/protonmail-desktop b/protonmail-desktop
deleted file mode 100644
index e024217bfb6e..000000000000
--- a/protonmail-desktop
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-/opt/protonmail-desktop/protonmail-desktop
diff --git a/protonmail-desktop.desktop b/protonmail-desktop.desktop
index 4b8c7284d81d..a0928a9b2eba 100644
--- a/protonmail-desktop.desktop
+++ b/protonmail-desktop.desktop
@@ -1,10 +1,8 @@
 [Desktop Entry]
-Name=Protonmail
-Comment=Protonmail desktop client
-Exec=/usr/bin/protonmail-desktop
-Icon=/opt/protonmail-desktop/icons/protonmail-desktop.png
-Terminal=false
+Version=1.0
 Type=Application
-Encoding=UTF-8
+Name=Protonmail Desktop
+Comment=Unofficial desktop app for ProtonMail email
+Exec=protonmail-desktop
+Icon=protonmail-desktop
 Categories=Network;Email;
-MimeType=message/rfc822;x-scheme-handler/mailto;application/x-xpinstall;
diff --git a/protonmail-desktop.sh b/protonmail-desktop.sh
new file mode 100644
index 000000000000..7a4895872aa7
--- /dev/null
+++ b/protonmail-desktop.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+electron /usr/lib/protonmail-desktop