this has gone too far, so use bundled electron

3 files changed, 32 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bd4950936af0..179ea6efce17 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Aug 25 02:07:30 UTC 2016
+# Fri Feb  3 15:17:12 UTC 2017
 pkgbase = electronic-wechat
 	pkgdesc = A better WeChat client
 	pkgver = 1.4.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/geeeeeeeeek/electronic-wechat
 	arch = x86_64
 	license = custom
@@ -13,12 +13,10 @@ pkgbase = electronic-wechat
 	depends = electron
 	source = git+https://github.com/geeeeeeeeek/electronic-wechat.git#tag=v1.4.0
 	source = electronic-wechat.desktop.in
-	source = remove-bundle-electron.patch
 	source = electronic-wechat.sh.in
 	sha256sums = SKIP
 	sha256sums = 192d2b31d8faa30142cffecb56352198a316e62b88703f5d3216acdcf76f6730
-	sha256sums = fe5e738390b7f638d2aa6e98ed2212b4de9964ddbcee4a380a7079eb06330427
-	sha256sums = 52b5c50a43f3a92e58d06f568152ed3d06d46318dc98dcbb10497f24f0353245
+	sha256sums = f2f2dc7e81e2f16cff2936f8694af8f02d089ff69236a95b9dc954695d9d69e9
 
 pkgname = electronic-wechat
 
diff --git a/PKGBUILD b/PKGBUILD
index 74835ac6394a..c3bcf41649a6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=electronic-wechat
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A better WeChat client"
 arch=('x86_64')
 url="https://github.com/geeeeeeeeek/electronic-wechat"
@@ -13,7 +13,7 @@ makedepends=('git' 'npm' 'imagemagick')
 source=(
     "git+https://github.com/geeeeeeeeek/electronic-wechat.git#tag=v${pkgver}"
     electronic-wechat.desktop.in
-    'remove-bundle-electron.patch'
+#    'remove-bundle-electron.patch'
     'electronic-wechat.sh.in'
 )
 
@@ -21,15 +21,37 @@ prepare() {
     cd "$srcdir"
     sed "s|@@VERSION@@|$pkgver|" electronic-wechat.desktop.in > electronic-wechat.desktop
 
-    cd "$srcdir/$pkgname"
-    patch -p1 < "$srcdir/remove-bundle-electron.patch"
+#    cd "$srcdir/$pkgname"
+#    patch -p1 < "$srcdir/remove-bundle-electron.patch"
 }
 
 build() {
     cd "$srcdir/$pkgname"
     npm install
+    npm run build:linux64
 }
 
+# package() {
+#     cd "$srcdir"
+#     install -Dm644 electronic-wechat.desktop -t "$pkgdir/usr/share/applications/"
+# 
+#     cd "$srcdir/$pkgname"
+#     install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+#     install -Dm644 assets/icon.png "$pkgdir/usr/share/icons/hicolor/512x512/apps/electronic-wechat.png"
+# 
+#     for size in 16 24 32 48 64 72 128 256; do
+#         target="$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/"
+#         mkdir -p $target
+#         convert assets/icon.png -resize ${size}x${size} "$target/$pkgname.png"
+#     done
+# 
+#     cd "$srcdir/$pkgname/"
+#     rm -rf scripts
+#     mkdir -p "$pkgdir/usr/lib/$pkgname/"
+#     cp -rv --no-preserve='ownership' -- * "$pkgdir/usr/lib/$pkgname/"
+#     install -Dm755 "$srcdir/electronic-wechat.sh.in" "$pkgdir/usr/bin/electronic-wechat"
+# }
+
 package() {
     cd "$srcdir"
     install -Dm644 electronic-wechat.desktop -t "$pkgdir/usr/share/applications/"
@@ -44,8 +66,7 @@ package() {
         convert assets/icon.png -resize ${size}x${size} "$target/$pkgname.png"
     done
 
-    cd "$srcdir/$pkgname/"
-    rm -rf scripts
+    cd "$srcdir/$pkgname/dist/electronic-wechat-linux-x64/"
     mkdir -p "$pkgdir/usr/lib/$pkgname/"
     cp -rv --no-preserve='ownership' -- * "$pkgdir/usr/lib/$pkgname/"
     install -Dm755 "$srcdir/electronic-wechat.sh.in" "$pkgdir/usr/bin/electronic-wechat"
@@ -53,5 +74,4 @@ package() {
 
 sha256sums=('SKIP'
             '192d2b31d8faa30142cffecb56352198a316e62b88703f5d3216acdcf76f6730'
-            'fe5e738390b7f638d2aa6e98ed2212b4de9964ddbcee4a380a7079eb06330427'
-            '52b5c50a43f3a92e58d06f568152ed3d06d46318dc98dcbb10497f24f0353245')
+            'f2f2dc7e81e2f16cff2936f8694af8f02d089ff69236a95b9dc954695d9d69e9')
diff --git a/electronic-wechat.sh.in b/electronic-wechat.sh.in
index 724e3cbd4279..9493d14191a1 100644
--- a/electronic-wechat.sh.in
+++ b/electronic-wechat.sh.in
@@ -4,4 +4,4 @@ PACKAGE_NAME="electronic-wechat"
 EW_DIR="/usr/lib/$PACKAGE_NAME"
 
 cd "$EW_DIR" || exit 1
-exec electron .
+exec electronic-wechat "$@"