From 92981e8b1f2dec0f15f9531de2fe8426293d01a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20H=C3=BCsers?= <aur@huesers.de>
Date: Thu, 4 Jan 2024 22:47:25 +0100
Subject: [PATCH] upgpkg: discord-electron 0.0.39-3: fix launcher

* Fix launcher error if config variable not set but rizin is installed
* Fix typo
---
 discord-electron/.SRCINFO                 | 4 ++--
 discord-electron/PKGBUILD                 | 4 ++--
 discord-electron/discord-electron.install | 2 +-
 discord-electron/discord-launcher.sh      | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/discord-electron/.SRCINFO b/discord-electron/.SRCINFO
index 27ae8eb..e8b5291 100644
--- a/discord-electron/.SRCINFO
+++ b/discord-electron/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = discord-electron
 	pkgdesc = Discord using system provided electron (v27) for increased security and performance
 	pkgver = 0.0.39
-	pkgrel = 2
+	pkgrel = 3
 	url = https://discord.com
 	install = discord-electron.install
 	arch = x86_64
@@ -21,6 +21,6 @@ pkgbase = discord-electron
 	source = https://dl.discordapp.net/apps/linux/0.0.39/discord-0.0.39.tar.gz
 	source = discord-launcher.sh
 	sha512sums = 9f18aea5d82f5db4efa9db9babbc440b24e47dc80df18df5cc58d99d677f1c0863df21ed96d69896785f8fbe0dc0ff1f7317398b8f39606289da79f5a38074f1
-	sha512sums = e68467468e9ebfe7aae873442998bda03212598a87d9af1b9ac976fdbafc81eb376e7770dccca6eb943d579f39717a0473fa4f0a46a0c3e436460688827a2dc7
+	sha512sums = ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566
 
 pkgname = discord-electron
diff --git a/discord-electron/PKGBUILD b/discord-electron/PKGBUILD
index b31630a..5be444e 100644
--- a/discord-electron/PKGBUILD
+++ b/discord-electron/PKGBUILD
@@ -14,7 +14,7 @@
 pkgname=discord-electron
 _pkgname=discord
 pkgver=0.0.39
-pkgrel=2
+pkgrel=3
 _electronver=27
 _electronname="electron${_electronver}"
 pkgdesc="Discord using system provided electron (v${_electronver}) for increased security and performance"
@@ -36,7 +36,7 @@ optdepends=(
 source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
 	'discord-launcher.sh')
 sha512sums=('9f18aea5d82f5db4efa9db9babbc440b24e47dc80df18df5cc58d99d677f1c0863df21ed96d69896785f8fbe0dc0ff1f7317398b8f39606289da79f5a38074f1'
-            'e68467468e9ebfe7aae873442998bda03212598a87d9af1b9ac976fdbafc81eb376e7770dccca6eb943d579f39717a0473fa4f0a46a0c3e436460688827a2dc7')
+            'ceaeb357a84df0695fe65867f81d2fa35a65a6f47f47a29022e09fa15cc816b3e250f63eee1025388f51665e6bc39262de7cb7a137f25caf1d922bbacd217566')
 
 _krisp_b2sum='310e3d5ad2311ceace91d20004a677c1a1e49fa1cd5c0458ee5bdb31c01c49df68cac625e66dadcaddf90c67568cde22c2cec3c0b6bca8385225141a8d8d53c1'
 
diff --git a/discord-electron/discord-electron.install b/discord-electron/discord-electron.install
index 893fcd9..193b455 100644
--- a/discord-electron/discord-electron.install
+++ b/discord-electron/discord-electron.install
@@ -1,5 +1,5 @@
 post_upgrade() {
-	# return if old package version is greater than or equal to 0.0.39-1...
+	# return if old package version is greater than or equal to 0.0.39-2...
 	(( $(vercmp $2 '0.0.39-2') >= 0 )) && return
 
 	cat <<EOF
diff --git a/discord-electron/discord-launcher.sh b/discord-electron/discord-launcher.sh
index 33d525c..55ff2a0 100644
--- a/discord-electron/discord-launcher.sh
+++ b/discord-electron/discord-launcher.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -euo pipefail
+set -eo pipefail
 
 declare -a flags
 
@@ -19,9 +19,9 @@ if hash rizin &> /dev/null && [[ "${PATCH_KRISP}" == true ]]; then
 	fi
 fi
 
-if [[ -w "${flags_file}" ]]; then
+if [[ -r "${flags_file}" ]]; then
 	# Replacing because old flag does not work
-	if grep -q '\--ignore-gpu-blacklist' "${flags_file}"; then
+	if [[ -w "${flags_file}" ]] && grep -q '\--ignore-gpu-blacklist' "${flags_file}"; then
 		sed -i "s|--ignore-gpu-blacklist|--ignore-gpu-blocklist|" "${flags_file}"
 	fi
 	mapfile -t < "${flags_file}"