electron-ssr: 0.2.5-5

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

4 files changed, 41 insertions, 2 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35d49230d2f0..1815931c0a1c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = electron-ssr
 	pkgdesc = Shadowsocksr client using electron.
 	pkgver = 0.2.5
-	pkgrel = 4
+	pkgrel = 5
 	url = https://github.com/erguotou520/electron-ssr
 	arch = x86_64
 	license = MIT
@@ -23,11 +23,13 @@ pkgbase = electron-ssr
 	source = electron-ssr.desktop
 	source = build.patch
 	source = argv.patch
+	source = path.patch
 	source = electron-ssr.sh
 	sha256sums = 87561b47486c2485c76136172c87f0df16ee9dc4cb85be7d77ce274328f92735
 	sha256sums = da2178b45bac74d2e0a2e5efc3598f9b2e5505baa97edd1153c5687e71b3642a
 	sha256sums = 387083e2a5be38d94b5f971a36f38a606260fd4c15d58524495b28481c45f746
 	sha256sums = 1dded3801546776041698f21fe2d239893eac0c4e4b0a99a93a613b3ff70de5f
+	sha256sums = f68db0cc60a934f55085a6b8ecee285ea878f859c665982e7f4b1931e7c64cd3
 	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/.gitignore b/.gitignore
new file mode 100644
index 000000000000..9a08420feb68
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+pkg
+src
+LICENSE
+*.tar.gz
+*.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index 3fe0abd77581..538b53cef537 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=electron-ssr
 pkgver=0.2.5
-pkgrel=4
+pkgrel=5
 pkgdesc='Shadowsocksr client using electron.'
 arch=('x86_64')
 conflicts=("electron-ssr-git")
@@ -20,6 +20,7 @@ source=('https://raw.githubusercontent.com/erguotou520/electron-ssr/master/LICEN
         'electron-ssr.desktop'
         'build.patch'
         'argv.patch'
+        'path.patch'
         'electron-ssr.sh')
 
 source_x86_64=("$pkgname-$pkgver.tar.gz::https://github.com/erguotou520/electron-ssr/archive/v$pkgver.tar.gz")
@@ -28,6 +29,7 @@ sha256sums=('87561b47486c2485c76136172c87f0df16ee9dc4cb85be7d77ce274328f92735'
             'da2178b45bac74d2e0a2e5efc3598f9b2e5505baa97edd1153c5687e71b3642a'
             '387083e2a5be38d94b5f971a36f38a606260fd4c15d58524495b28481c45f746'
             '1dded3801546776041698f21fe2d239893eac0c4e4b0a99a93a613b3ff70de5f'
+            'd8c759dcb635e27ec00d943aa0ceef07bfa445192c2854951b5f60b982cf3538'
             '5dfe00e15a2dbf461d0b48107b4a994ef9444801e5f9b7083a4b020e634db67f')
 sha256sums_x86_64=('2cc79109fa9dee400482ebc91a19ac1c96046d7788a40641ea4ee75fc3b04101')
 
@@ -37,6 +39,7 @@ prepare() {
     cd $dir
     patch -Np1 -i "$srcdir/build.patch"
     patch -Np1 -i "$srcdir/argv.patch"
+    patch -Np1 -i "$srcdir/path.patch"
 }
 
 build() {
diff --git a/path.patch b/path.patch
new file mode 100644
index 000000000000..bc0fae2e700b
--- /dev/null
+++ b/path.patch
@@ -0,0 +1,29 @@
+diff -ura electron-ssr-0.2.5/src/main/bootstrap.js electron-ssr-0.2.5-new/src/main/bootstrap.js
+--- electron-ssr-0.2.5/src/main/bootstrap.js	2018-12-26 18:29:32.000000000 +0800
++++ electron-ssr-0.2.5-new/src/main/bootstrap.js	2019-01-21 22:10:10.157584848 +0800
+@@ -36,6 +36,7 @@
+   logger.error(`Unhandled Rejection at: Promise ${p}, reason: ${reason}`)
+ })
+ 
++app.setPath('userData', path.join(app.getPath('appData'), 'electron-ssr'))
+ // 应用配置存储目录
+ export const appConfigDir = app.getPath('userData')
+ // 应用配置存储路径
+
+diff -ura electron-ssr-0.2.5/src/main/logger.js electron-ssr-0.2.5-new/src/main/logger.js
+--- electron-ssr-0.2.5/src/main/logger.js   2018-12-26 18:29:32.000000000 +0800
++++ electron-ssr-0.2.5-new/src/main/logger.js 2019-01-21 22:29:14.657347146 +0800
+@@ -3,11 +3,13 @@
+ import { join } from 'path'
+ import { ensureDirSync } from 'fs-extra'
+ import * as Sentry from '@sentry/electron'
++import path from 'path'
+ 
+ if (process.env.NODE_ENV === 'production') {
+   Sentry.init({ dsn: 'https://39bffe7372d14000bd5d30e50a27c388@sentry.io/1359858' })
+ }
+ 
++app.setPath('userData', path.join(app.getPath('appData'), 'electron-ssr'))
+ const userPath = app.getPath('userData')
+ const logFolder = join(userPath, 'logs')
+ ensureDirSync(logFolder)