electron-ssr: 0.2.5-3

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

5 files changed, 31 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 89c69dbccbe7..2eec0ae51085 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electron-ssr
 	pkgdesc = Shadowsocksr client using electron.
 	pkgver = 0.2.5
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/erguotou520/electron-ssr
 	arch = x86_64
 	license = MIT
@@ -23,12 +23,14 @@ pkgbase = electron-ssr
 	source = icons.tar.gz
 	source = electron-ssr.desktop
 	source = build.patch
+	source = argv.patch
 	source = electron-ssr.sh
 	sha256sums = 87561b47486c2485c76136172c87f0df16ee9dc4cb85be7d77ce274328f92735
 	sha256sums = 0d4372037676a0ee8f17f7cb875192923062a80ad61695dbe4548fde609d7698
-	sha256sums = 5adc01a09122a97fec15bce51a6830c210985f05df0c8aa83c7103ab7c0f7fbd
-	sha256sums = c7e02424f73108543e7ae40907b87e5544479d261c1959604fc407f5a417b154
-	sha256sums = 2c18adbf1e8264698674853de1e4ec3a26bb457fafc9eea712019960cbd4e7a2
+	sha256sums = da2178b45bac74d2e0a2e5efc3598f9b2e5505baa97edd1153c5687e71b3642a
+	sha256sums = 387083e2a5be38d94b5f971a36f38a606260fd4c15d58524495b28481c45f746
+	sha256sums = 0d7b88059bd8c98c368234a476da41e94e16f886f5a7cde53223e990628db23f
+	sha256sums = 5dfe00e15a2dbf461d0b48107b4a994ef9444801e5f9b7083a4b020e634db67f
 	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
 
diff --git a/PKGBUILD b/PKGBUILD
index c3852c8583ce..69c1f1f5dff0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=electron-ssr
 pkgver=0.2.5
-pkgrel=2
+pkgrel=3
 pkgdesc='Shadowsocksr client using electron.'
 arch=('x86_64')
 conflicts=("electron-ssr-git")
@@ -20,14 +20,16 @@ source=('https://raw.githubusercontent.com/erguotou520/electron-ssr/master/LICEN
         'icons.tar.gz'
         'electron-ssr.desktop'
         'build.patch'
+        'argv.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'
-            'c7e02424f73108543e7ae40907b87e5544479d261c1959604fc407f5a417b154'
+            'da2178b45bac74d2e0a2e5efc3598f9b2e5505baa97edd1153c5687e71b3642a'
+            '387083e2a5be38d94b5f971a36f38a606260fd4c15d58524495b28481c45f746'
+            '1dded3801546776041698f21fe2d239893eac0c4e4b0a99a93a613b3ff70de5f'
             '5dfe00e15a2dbf461d0b48107b4a994ef9444801e5f9b7083a4b020e634db67f')
 sha256sums_x86_64=('2cc79109fa9dee400482ebc91a19ac1c96046d7788a40641ea4ee75fc3b04101')
 
@@ -36,6 +38,7 @@ prepare() {
     dir=$srcdir/$pkgname-$pkgver/
     cd $dir
     patch -Np1 -i "$srcdir/build.patch"
+    patch -Np1 -i "$srcdir/argv.patch"
 }
 
 build() {
diff --git a/argv.patch b/argv.patch
new file mode 100644
index 000000000000..bba03602240c
--- /dev/null
+++ b/argv.patch
@@ -0,0 +1,17 @@
+diff -ura electron-ssr-0.2.5/src/main/index.js electron-ssr-0.2.5-new/src/main/index.js
+--- electron-ssr-0.2.5/src/main/index.js	2018-12-26 18:29:32.000000000 +0800
++++ electron-ssr-0.2.5-new/src/main/index.js	2019-01-20 15:08:44.166253824 +0800
+@@ -28,7 +28,12 @@
+   }
+   // 如果是通过链接打开的应用，则添加记录
+   if (argv[1]) {
+-    const configs = loadConfigsFromString(argv[1])
++    let configs = null
++    if (argv[0] !== 'electron-ssr') {
++      configs = loadConfigsFromString(argv[2])
++    } else {
++      configs = loadConfigsFromString(argv[1])
++    }
+     if (configs.length) {
+       addConfigs(configs)
+     }
diff --git a/build.patch b/build.patch
index 799fc0ca48ff..65a1484bae30 100644
--- a/build.patch
+++ b/build.patch
@@ -1,4 +1,4 @@
-diff -ura electron-ssr-0.2.5/.electron-vue/release.js electron-ssr-0.2.5-new/.electron-vue/release.js
+diff -ura electron-ssr-0.2.5/.electron-vue/build.js electron-ssr-0.2.5-new/.electron-vue/build.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 @@
diff --git a/electron-ssr.desktop b/electron-ssr.desktop
index cb23c1584a8f..c9167bf85293 100644
--- a/electron-ssr.desktop
+++ b/electron-ssr.desktop
@@ -6,3 +6,4 @@ Terminal=false
 Type=Application
 Icon=electron-ssr
 Categories=Network;
+MimeType=x-scheme-handler/ss;x-scheme-handler/ssr;