From 9b29b0b9df5374e8978437d5d6bb60ef58812a3a Mon Sep 17 00:00:00 2001
From: "John C. Allwein" <git@johnnyapol.me>
Date: Sat, 30 May 2020 12:10:13 -0400
Subject: [PATCH] 0.0.10-5: support electron9

---
 .SRCINFO |  3 ++-
 PKGBUILD | 17 +++++++++++------
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 59b60ee..390ffb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = discord_arch_electron
 	pkgdesc = All-in-one voice and text chat for gamers that's free and secure.
 	pkgver = 0.0.10
-	pkgrel = 4
+	pkgrel = 5
 	url = https://discordapp.com
 	arch = x86_64
 	license = custom
@@ -9,6 +9,7 @@ pkgbase = discord_arch_electron
 	optdepends = libpulse: Pulseaudio support
 	optdepends = xdg-utils: Open files
 	provides = discord
+	conflicts = discord
 	source = https://dl.discordapp.net/apps/linux/0.0.10/discord-0.0.10.tar.gz
 	source = LICENSE.html::https://discordapp.com/terms
 	source = OSS-LICENSES.html::https://discordapp.com/licenses
diff --git a/PKGBUILD b/PKGBUILD
index ace5dd2..b58992f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,11 @@
 pkgname=discord_arch_electron
 _pkgname=discord
 pkgver=0.0.10
-pkgrel=4
+pkgrel=5
 pkgdesc="All-in-one voice and text chat for gamers that's free and secure."
 arch=('x86_64')
 provides=('discord')
+conflicts=('discord')
 url='https://discordapp.com'
 license=('custom')
 depends=('electron')
@@ -24,9 +25,6 @@ prepare() {
 
   sed -i "s|Exec=.*|Exec=/usr/bin/$_pkgname|" $_pkgname.desktop
   echo 'Path=/usr/bin' >> $_pkgname.desktop
-
-  # We need to hack in our custom app.asar path, otherwise electron will complain
-  sed -i "s|_path2.default.join(process.resourcesPath, 'build_info.json')|'/opt/$_pkgname/resources/build_info.json'                     |" resources/app.asar
 }
 
 package() {
@@ -46,9 +44,16 @@ package() {
   chmod 755 "$pkgdir"/opt/$_pkgname/$_pkgname
 
   install -d "$pkgdir"/usr/{bin,share/{pixmaps,applications}}
+  install -d "$pkgdir"/usr/lib/electron
+  install -d "$pkgdir"/usr/lib/electron/resources
+
   ln -s /opt/$_pkgname/$_pkgname "$pkgdir"/usr/bin/$_pkgname
-  ln -s /opt/$_pkgname/discord.png "$pkgdir"/usr/share/pixmaps/$_pkgname.png
-  ln -s /opt/$_pkgname/$_pkgname.desktop "$pkgdir"/usr/share/applications/$_pkgname.desktop
+  ln -sf /opt/$_pkgname/discord.png "$pkgdir"/usr/share/pixmaps/$_pkgname.png
+  ln -sf /opt/$_pkgname/$_pkgname.desktop "$pkgdir"/usr/share/applications/$_pkgname.desktop
+
+  # HACKS FOR SYSTEM ELECTRON
+  ln -s /opt/$_pkgname/resources/build_info.json "$pkgdir"/usr/lib/electron/resources/
+  ln -s /opt/$_pkgname/discord.png        "$pkgdir"/usr/lib/electron
 
   # Licenses
   install -Dm 644 LICENSE.html "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.html