Use system Electron

3 files changed, 18 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b7ee38115892..070af5013bc4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = mycrypto-bin
 	pkgdesc = Open-source, client-side tool for generating Ether Wallets, handling ERC-20 tokens, and interacting with the blockchain more easily
 	pkgver = 1.4.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/MyCryptoHQ/MyCrypto
 	arch = x86_64
 	license = MIT
@@ -13,8 +13,10 @@ pkgbase = mycrypto-bin
 	conflicts = mycrypto
 	source = https://github.com/MyCryptoHQ/MyCrypto/releases/download/1.4.0/linux-x86-64_1.4.0_MyCrypto.AppImage
 	source = LICENSE
+	source = mycrypto.sh
 	sha256sums = 7d98cbea40e6c9083ce4478965c0235b4e9d17f15d1a01840a05533219e45d8a
 	sha256sums = e4d52665623eaeb7d6efa43c0c29d225cd009cd766dc15f1b464a19cab1ec5cb
+	sha256sums = eb800f7d523bbff35010f640d06cc35c7fd62ee522c9615cd45acb5413df01f0
 
 pkgname = mycrypto-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index f20b65211bd6..8d9463c2f8ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 pkgname=mycrypto-bin
 _pkgname=mycrypto
 pkgver=1.4.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Open-source, client-side tool for generating Ether Wallets, handling ERC-20 tokens, and interacting with the blockchain more easily'
 arch=('x86_64')
 depends=('gconf' 'gtk3' 'libxss' 'nss')
@@ -12,9 +12,11 @@ conflicts=('mycrypto')
 url='https://github.com/MyCryptoHQ/MyCrypto'
 license=('MIT')
 source=("${url}/releases/download/${pkgver}/linux-x86-64_${pkgver}_MyCrypto.AppImage"
-        'LICENSE')
+        'LICENSE'
+        'mycrypto.sh')
 sha256sums=('7d98cbea40e6c9083ce4478965c0235b4e9d17f15d1a01840a05533219e45d8a'
-            'e4d52665623eaeb7d6efa43c0c29d225cd009cd766dc15f1b464a19cab1ec5cb')
+            'e4d52665623eaeb7d6efa43c0c29d225cd009cd766dc15f1b464a19cab1ec5cb'
+            'eb800f7d523bbff35010f640d06cc35c7fd62ee522c9615cd45acb5413df01f0')
 
 prepare() {
   # Extract AppImage
@@ -27,21 +29,15 @@ package() {
   cd $_pkgname-$pkgver
 
   # Lib directory
-  install -d "$pkgdir"/usr/lib/$_pkgname
-  cp -r app/{locales,resources,*.dat,*.pak,*.so,*.bin} "$pkgdir"/usr/lib/$_pkgname
-  install -Dm755 app/mycrypto -t "$pkgdir"/usr/lib/$_pkgname
+  install -Dm644 app/resources/app.asar -t "$pkgdir"/usr/share/$_pkgname/
+  # Executable
+  install -Dm755 ../mycrypto.sh "$pkgdir"/usr/bin/$_pkgname
   # Desktop entry
-  sed -i s/AppRun/mycrypto/ mycrypto.desktop
-  install -Dm644 mycrypto.desktop -t "$pkgdir"/usr/share/applications
+  sed -i s/AppRun/$_pkgname/ mycrypto.desktop
+  install -Dm644 mycrypto.desktop -t "$pkgdir"/usr/share/applications/
   # Icon
   install -Dm644 usr/share/icons/hicolor/0x0/apps/mycrypto.png \
-    -t "$pkgdir"/usr/share/icons/hicolor/256x256/apps
-  # Executable
-  install -d "$pkgdir"/usr/bin
-  ln -s /usr/lib/$_pkgname/mycrypto "$pkgdir"/usr/bin/$_pkgname
-  # Licenses
-  install -Dm644 "$srcdir"/LICENSE -t "$pkgdir"/usr/share/licenses/$_pkgname
-  cp -r app/{*.txt,*.html} "$pkgdir"/usr/share/licenses/$_pkgname
-  # Fix permissions
-  find "$pkgdir"/usr -type d -exec chmod 755 {} \;
+    -t "$pkgdir"/usr/share/icons/hicolor/256x256/apps/
+  # License
+  install -Dm644 "$srcdir"/LICENSE -t "$pkgdir"/usr/share/licenses/$_pkgname/
 }
diff --git a/mycrypto.sh b/mycrypto.sh
new file mode 100644
index 000000000000..d228a09b0572
--- /dev/null
+++ b/mycrypto.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec electron /usr/share/mycrypto/app.asar "$@"