From 374d183eea13d3260a3ba02093253d405fc87ecf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=BCsers?= <aur@huesers.de>
Date: Mon, 3 Jul 2023 22:56:16 +0200
Subject: [PATCH] upgpkg: discord-electron 0.0.27-6

Fix use of wrong pkgver variable (Thanks to @rsa)
Unset not needed variables in launch script
Rewording install file text
---
 discord-electron/.SRCINFO                 |  4 ++--
 discord-electron/PKGBUILD                 |  6 +++---
 discord-electron/discord-electron.install |  9 ++++-----
 discord-electron/discord-launcher.sh      | 11 ++++++++---
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/discord-electron/.SRCINFO b/discord-electron/.SRCINFO
index 6e84783..0790f4b 100644
--- a/discord-electron/.SRCINFO
+++ b/discord-electron/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = discord-electron
 	pkgdesc = Discord using system provided electron (v22) for increased security and performance
 	pkgver = 0.0.27
-	pkgrel = 5
+	pkgrel = 6
 	url = https://discord.com
 	install = discord-electron.install
 	arch = x86_64
@@ -20,6 +20,6 @@ pkgbase = discord-electron
 	source = https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz
 	source = discord-launcher.sh
 	sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f
-	sha512sums = 1da218eb240901ed48c392c154d061b02024daeb02ee7d991cdbc97ecba30a6f06af25abb602880872d89dcc63a8cd4d149c12414086b081035938deff8fe26d
+	sha512sums = 4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0
 
 pkgname = discord-electron
diff --git a/discord-electron/PKGBUILD b/discord-electron/PKGBUILD
index ac3a63d..57b1983 100644
--- a/discord-electron/PKGBUILD
+++ b/discord-electron/PKGBUILD
@@ -15,7 +15,7 @@ pkgname=discord-electron
 _pkgname=discord
 _electron=22
 pkgver=0.0.27
-pkgrel=5
+pkgrel=6
 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance"
 arch=('x86_64')
 provides=("${_pkgname}")
@@ -34,13 +34,13 @@ optdepends=(
 source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz"
 	'discord-launcher.sh')
 sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f'
-            '1da218eb240901ed48c392c154d061b02024daeb02ee7d991cdbc97ecba30a6f06af25abb602880872d89dcc63a8cd4d149c12414086b081035938deff8fe26d')
+            '4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0')
 
 _krisp_b2sum='592f55259500afc0d7fd334a10d3c1991fae05db870bf12437edc43cf693988195341f2cb827aba333c0e65fb4cb40dccfcc5d6a84dea4a1645f9563505b6496'
 
 prepare() {
 	# prepare launcher script
-	sed -i "s|@PKGNAME@|${_pkgname}|g;s|@PKGVER@|${_pkgver}|g;s|@ELECTRON@|${_electron}|g;s|@KRISPB2@|${_krisp_b2sum}|g" discord-launcher.sh
+	sed -i "s|@PKGNAME@|${_pkgname}|g;s|@PKGVER@|${pkgver}|g;s|@ELECTRON@|${_electron}|g;s|@KRISPB2@|${_krisp_b2sum}|g" discord-launcher.sh
 
 	# fix the .desktop file
 	sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" Discord/$_pkgname.desktop
diff --git a/discord-electron/discord-electron.install b/discord-electron/discord-electron.install
index 5516bf2..3d13381 100644
--- a/discord-electron/discord-electron.install
+++ b/discord-electron/discord-electron.install
@@ -5,23 +5,22 @@ post_upgrade() {
 	cat <<EOF
 ==> The launch script will now patch Krisp noise suppression support
     if 'rizin' is installed. Restart your Discord client after update
-    to apply the patch
+    to apply the patch.
 EOF
 
 	# return if old package version is greater than or equal to 0.0.27-2...
 	(( $(vercmp $2 '0.0.27-2') >= 0 )) && return
 
 	cat <<EOF
-==> You can now add or uncomment additional Electron flags in
-    '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set)
+==> You can now set additional Electron flags in '~/.config/discord-flags.conf'.
 EOF
 }
 
 post_install() {
 	cat <<EOF
 ==> For Krisp noise suppression support consider installing 'rizin'. Restart
-    your Discord client after installation or update to apply the patch
+    your Discord client after installation or update to apply the patch.
 ==> In case of performance problems consider adding or uncommenting Electron
-    flags in '~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set)
+    flags in '~/.config/discord-flags.conf'.
 EOF
 }
diff --git a/discord-electron/discord-launcher.sh b/discord-electron/discord-launcher.sh
index 7e50f72..898e51e 100644
--- a/discord-electron/discord-launcher.sh
+++ b/discord-electron/discord-launcher.sh
@@ -2,14 +2,16 @@
 
 set -euo pipefail
 
+declare -a flags
+
+
 flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf"
 krisp_bin="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@/@PKGVER@/modules/@PKGNAME@_krisp/@PKGNAME@_krisp.node"
-
-declare -a flags
+krisp_b2=@KRISPB2@
 
 if hash rizin &> /dev/null; then
 	# Patch Krisp binary to ignore signature check
-	if [[ -f "${krisp_bin}" && $(b2sum "${krisp_bin}" | head -c 128) == @KRISPB2@ ]]; then
+	if [[ -f "${krisp_bin}" && $(b2sum "${krisp_bin}" | head -c 128) == $krisp_b2 ]]; then
 		addr=$(rz-find -x '4889dfe8........4889dfe8' "${krisp_bin}" | head -n1)
 		rizin -q -w -c "s $addr + 0x12 ; wao nop" "${krisp_bin}" &> /dev/null
 	fi
@@ -34,6 +36,9 @@ for line in "${MAPFILE[@]}"; do
 	fi
 done
 
+unset flags_file krisp_bin krisp_b2
+
+
 exec /usr/bin/electron@ELECTRON@ \
 	/usr/lib/@PKGNAME@/app.asar \
 	--ozone-platform-hint=auto \