electron-ssr: 0.2.5 & use system electron

Signed-off-by: Bruce Zhang <zttt183525594@gmail.com>

5 files changed, 53 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0e1dc2d8695e..d91c16d9d271 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electron-ssr
 	pkgdesc = Shadowsocksr client using electron.
-	pkgver = 0.2.4
-	pkgrel = 2
+	pkgver = 0.2.5
+	pkgrel = 1
 	url = https://github.com/erguotou520/electron-ssr
 	arch = x86_64
 	license = MIT
@@ -14,19 +14,23 @@ pkgbase = electron-ssr
 	depends = libxss
 	depends = nss
 	depends = libxtst
+	depends = electron
 	optdepends = libsodium: sodium crypto support
 	provides = electron-ssr
 	conflicts = electron-ssr-git
+	options = !strip
 	source = https://raw.githubusercontent.com/erguotou520/electron-ssr/master/LICENSE
 	source = icons.tar.gz
 	source = electron-ssr.desktop
-	source = electron-ssr.patch
+	source = build.patch
+	source = electron-ssr.sh
 	sha256sums = 87561b47486c2485c76136172c87f0df16ee9dc4cb85be7d77ce274328f92735
 	sha256sums = 0d4372037676a0ee8f17f7cb875192923062a80ad61695dbe4548fde609d7698
 	sha256sums = 5adc01a09122a97fec15bce51a6830c210985f05df0c8aa83c7103ab7c0f7fbd
-	sha256sums = c85164668da8cfdecad69e5f5545b433390116eed958c47f611e4b2153992970
-	source_x86_64 = electron-ssr-0.2.4.tar.gz::https://github.com/erguotou520/electron-ssr/archive/v0.2.4.tar.gz
-	sha256sums_x86_64 = 749ec7ccfeb6ff161340294e563910bdee481741bfd591e830c5bac8210ef1a9
+	sha256sums = c7e02424f73108543e7ae40907b87e5544479d261c1959604fc407f5a417b154
+	sha256sums = e719d9bfa2a7acd8c6edf0bdc0d873bcc1067f71ad3bf271929f8db91699d027
+	source_x86_64 = electron-ssr-0.2.5.tar.gz::https://github.com/erguotou520/electron-ssr/archive/v0.2.5.tar.gz
+	sha256sums_x86_64 = 2cc79109fa9dee400482ebc91a19ac1c96046d7788a40641ea4ee75fc3b04101
 
 pkgname = electron-ssr
 
diff --git a/PKGBUILD b/PKGBUILD
index 140b6d101906..32d92f627242 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
-# Maintainer: Ariel AxionL <axionl@aosc.io>
+# Maintainer: Bruce Zhang <zttt183525594@gmail.com>
+# Contributor: Ariel AxionL <axionl@aosc.io>
 
 pkgname=electron-ssr
-pkgver=0.2.4
-pkgrel=2
+pkgver=0.2.5
+pkgrel=1
 pkgdesc='Shadowsocksr client using electron.'
 arch=('x86_64')
 conflicts=("electron-ssr-git")
@@ -10,61 +11,62 @@ provides=("electron-ssr")
 url='https://github.com/erguotou520/electron-ssr'
 license=('MIT')
 depends=('gtk2' 'gconf' 'alsa-lib' 
-         'libxss' 'nss' 'libxtst')
+         'libxss' 'nss' 'libxtst' 'electron')
 makedepends=('yarn' 'npm' 'hicolor-icon-theme')
 optdepends=('libsodium: sodium crypto support')
+options=('!strip')
 
 source=('https://raw.githubusercontent.com/erguotou520/electron-ssr/master/LICENSE'
         'icons.tar.gz'
         'electron-ssr.desktop'
-        'electron-ssr.patch')
+        'build.patch'
+        'electron-ssr.sh')
 
 source_x86_64=("$pkgname-$pkgver.tar.gz::https://github.com/erguotou520/electron-ssr/archive/v$pkgver.tar.gz")
 
 sha256sums=('87561b47486c2485c76136172c87f0df16ee9dc4cb85be7d77ce274328f92735'
             '0d4372037676a0ee8f17f7cb875192923062a80ad61695dbe4548fde609d7698'
             '5adc01a09122a97fec15bce51a6830c210985f05df0c8aa83c7103ab7c0f7fbd'
-            'c85164668da8cfdecad69e5f5545b433390116eed958c47f611e4b2153992970')
-sha256sums_x86_64=('749ec7ccfeb6ff161340294e563910bdee481741bfd591e830c5bac8210ef1a9')
+            'c7e02424f73108543e7ae40907b87e5544479d261c1959604fc407f5a417b154'
+            '2c18adbf1e8264698674853de1e4ec3a26bb457fafc9eea712019960cbd4e7a2')
+sha256sums_x86_64=('2cc79109fa9dee400482ebc91a19ac1c96046d7788a40641ea4ee75fc3b04101')
 
 prepare() {
 	# Remove useless things
     dir=$srcdir/$pkgname-$pkgver/
     cd $dir
-    patch -Np1 -i "$srcdir/$pkgname.patch"
+    patch -Np1 -i "$srcdir/build.patch"
 }
 
 build() {
-    dir=$srcdir/$pkgname-$pkgver/
-    cd $dir
+    cd $srcdir/$pkgname-$pkgver
 
     # Build Package
     yarn
     npm run build
-
-    # Extract Package
-    buildDir=$srcdir/$pkgname-$pkgver-build/
-    install -dm755 $buildDir
-    tar xf ./build/$pkgname-$pkgver.tar.gz -C $buildDir
 }
 
 package() {
-    # Create path
-    install -dm755 $pkgdir/opt/$pkgname
-    install -dm755 $pkgdir/usr/bin
+    # Install 
+    cd $srcdir/$pkgname-$pkgver/dist/electron
+    find * -type f -exec install -Dm644 {} "${pkgdir}/opt/electron-ssr/{}" \;
+    install -Dm755 $srcdir/electron-ssr.sh $pkgdir/opt/$pkgname/electron-ssr
+    mkdir -p $pkgdir/usr/bin
+    ln -s /opt/$pkgname/electron-ssr $pkgdir/usr/bin/electron-ssr
+
+    # Install modules
+    cd $srcdir/$pkgname-$pkgver/node_modules
+    find * -type f -exec install -Dm644 {} "${pkgdir}/opt/electron-ssr/node_modules/{}" \;
+    cd "${pkgdir}/opt/electron-ssr/node_modules"
+    rm -r ./electron
 
     # Install Other things
-    install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-    install -Dm644 $pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
+    install -Dm644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+    install -Dm644 $srcdir/$pkgname.desktop $pkgdir/usr/share/applications/$pkgname.desktop
 
     cd $srcdir
     cd icons
     for i in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256; do
         install -Dm644 $i.png $pkgdir/usr/share/icons/hicolor/$i/apps/$pkgname.png
     done
-
-    # Install main programs
-    buildDir=$srcdir/$pkgname-$pkgver-build/$pkgname-$pkgver
-    cp -r $buildDir/* $pkgdir/opt/$pkgname
-    ln -s /opt/$pkgname/$pkgname $pkgdir/usr/bin/$pkgname
 }
diff --git a/build.patch b/build.patch
new file mode 100644
index 000000000000..799fc0ca48ff
--- /dev/null
+++ b/build.patch
@@ -0,0 +1,14 @@
+diff -ura electron-ssr-0.2.5/.electron-vue/release.js electron-ssr-0.2.5-new/.electron-vue/release.js
+--- electron-ssr-0.2.5/.electron-vue/build.js	2019-01-19 23:15:33.631275262 +0800
++++ electron-ssr-0.2.5-new/.electron-vue/build.js	2019-01-19 23:15:37.908378989 +0800
+@@ -46,10 +46,6 @@
+     process.stdout.write('\x1B[2J\x1B[0f')
+     console.log(`\n\n${results}`)
+     console.log(`${okayLog}take it away ${chalk.yellow('`electron-builder`')}\n`)
+-    // 打包发布版本
+-    release().then(function () {
+-      process.exit()
+-    })
+   })
+ 
+   pack(mainConfig).then(result => {
diff --git a/electron-ssr.patch b/electron-ssr.patch
deleted file mode 100644
index 79d725a43ffc..000000000000
--- a/electron-ssr.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ura electron-ssr-0.2.3/.electron-vue/release.js electron-ssr-0.2.3-new/.electron-vue/release.js
---- electron-ssr-0.2.3/.electron-vue/release.js	2018-03-28 11:59:54.000000000 +0800
-+++ electron-ssr-0.2.3-new/.electron-vue/release.js	2018-05-27 18:27:36.520548926 +0800
-@@ -116,11 +116,11 @@
-         icon: 'build/icons',
-         category: 'Development',
-         target: [
--          'deb',
--          'rpm',
-+          // 'deb',
-+          // 'rpm',
-           'tar.gz',
--          'pacman',
--          'appImage'
-+          // 'pacman',
-+          // 'appImage'
-         ]
-       }
-     })
diff --git a/electron-ssr.sh b/electron-ssr.sh
new file mode 100644
index 000000000000..60aa1fb9285d
--- /dev/null
+++ b/electron-ssr.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+exec electron /opt/electron-ssr/main.js "$@"