upgpkg: discord-electron-openasar 0.0.28+811-1

upstream release
Refactor PKGBUILD slightly
Update Krisp checksum
Check for empty lines when parsing flags

discord-electron-openasar/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = discord-electron-openasar
 	pkgdesc = Discord packaged with OpenAsar using system provided electron (v22) for increased security and performance
-	pkgver = 0.0.27+811
+	pkgver = 0.0.28+811
 	pkgrel = 1
 	url = https://discord.com
 	install = discord-electron-openasar.install
@@ -20,11 +20,11 @@ pkgbase = discord-electron-openasar
 	provides = discord
 	conflicts = discord
 	options = !strip
-	source = https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz
+	source = https://dl.discordapp.net/apps/linux/0.0.28/discord-0.0.28.tar.gz
 	source = discord-launcher.sh
 	source = git+https://github.com/goosemod/openasar.git#commit=5ac246dc92e9a2a9b314d899df728f37096c482b
-	sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f
-	sha512sums = 4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0
+	sha512sums = 763fe47a0fb21a13e852bcc818d4e0e2ea4faf23fcfdc02fddfe06e8c829499e028e27b45d807d3b3edcc36788990f3f21c0460b9b8efc538b62f3b41aeb744d
+	sha512sums = f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826
 	sha512sums = SKIP
 
 pkgname = discord-electron-openasar

discord-electron-openasar/PKGBUILD

@@ -7,7 +7,7 @@
 pkgname=discord-electron-openasar
 _pkgname=discord
 _electron=22
-pkgver=0.0.27+811
+pkgver=0.0.28+811
 _pkgver=${pkgver%%+*}
 pkgrel=1
 pkgdesc="Discord packaged with OpenAsar using system provided electron (v${_electron}) for increased security and performance"
@@ -26,14 +26,14 @@ optdepends=(
 	'xdg-utils: Open files'
 	'rizin: Allow patching Krisp support'
 )
-source=("https://dl.discordapp.net/apps/linux/${_pkgver}/discord-${_pkgver}.tar.gz"
+source=("https://dl.discordapp.net/apps/linux/${_pkgver}/${_pkgname}-${_pkgver}.tar.gz"
 	'discord-launcher.sh'
 	"git+https://github.com/goosemod/openasar.git#commit=5ac246dc92e9a2a9b314d899df728f37096c482b")
-sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f'
-            '4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0'
+sha512sums=('763fe47a0fb21a13e852bcc818d4e0e2ea4faf23fcfdc02fddfe06e8c829499e028e27b45d807d3b3edcc36788990f3f21c0460b9b8efc538b62f3b41aeb744d'
+            'f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826'
             'SKIP')
 
-_krisp_b2sum='592f55259500afc0d7fd334a10d3c1991fae05db870bf12437edc43cf693988195341f2cb827aba333c0e65fb4cb40dccfcc5d6a84dea4a1645f9563505b6496'
+_krisp_b2sum='56c8c5167e3c4b51720accf0acfe46e7e073b015600088b6bb4d2b7a259cd788c4facba2d7332b535cfa39b91ee94840d6ea905c5d0c9cca43fa0a26f5185cc9'
 
 # just in case I get the version wrong
 pkgver() {
@@ -46,37 +46,35 @@ prepare() {
 	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
+	sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" ${_pkgname^}/$_pkgname.desktop
 
 	# create the license files
 	curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md
 	curl https://discord.com/licenses | html2text >"${srcdir}"/OSS-LICENSES.md
 }
 
+build() {
+	cd "${srcdir}"/openasar
+
+	# pack openasar
+	sed -i -e "s/nightly/nightly-$(git rev-parse HEAD | cut -c 1-7)/" src/index.js
+	node scripts/strip.js
+	asar p src app.asar
+}
+
 package() {
 	# create necessary directories
 	install -d "${pkgdir}"/usr/{lib/$_pkgname,bin}
 	install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname}
 
-	cd "${srcdir}/openasar"
-
-	# pack openasar
-	sed -i -e "s/nightly/nightly-$(git rev-parse HEAD | cut -c 1-7)/" src/index.js
-	node scripts/strip.js
-	asar p src app.asar
-
-	cd "${srcdir}/Discord"
-
 	# copy relevant data
-	cp -r resources/* "${pkgdir}"/usr/lib/$_pkgname/
-	cp $_pkgname.png \
+	cp -r ${_pkgname^}/resources/* "${pkgdir}"/usr/lib/$_pkgname/
+	cp ${_pkgname^}/$_pkgname.png \
 		"${pkgdir}"/usr/share/pixmaps/$_pkgname.png
-	cp $_pkgname.desktop \
+	cp ${_pkgname^}/$_pkgname.desktop \
 		"${pkgdir}"/usr/share/applications/$_pkgname.desktop
 
-	cd "${srcdir}"
-
-	# copy openasar
+	# overwrite Discord asar
 	install -Dm 644 openasar/app.asar "${pkgdir}"/usr/lib/$_pkgname/
 
 	# install the launch script

discord-electron-openasar/discord-launcher.sh

@@ -31,7 +31,7 @@ EOF
 fi
 
 for line in "${MAPFILE[@]}"; do
-	if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
+	if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then
 		flags+=("${line}")
 	fi
 done

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 = 7
+	pkgver = 0.0.28
+	pkgrel = 1
 	url = https://discord.com
 	install = discord-electron.install
 	arch = x86_64
@@ -18,9 +18,9 @@ pkgbase = discord-electron
 	provides = discord
 	conflicts = discord
 	options = !strip
-	source = https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz
+	source = https://dl.discordapp.net/apps/linux/0.0.28/discord-0.0.28.tar.gz
 	source = discord-launcher.sh
-	sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f
-	sha512sums = 4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0
+	sha512sums = 763fe47a0fb21a13e852bcc818d4e0e2ea4faf23fcfdc02fddfe06e8c829499e028e27b45d807d3b3edcc36788990f3f21c0460b9b8efc538b62f3b41aeb744d
+	sha512sums = f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826
 
 pkgname = discord-electron

discord-electron/PKGBUILD

@@ -14,8 +14,8 @@
 pkgname=discord-electron
 _pkgname=discord
 _electron=22
-pkgver=0.0.27
-pkgrel=7
+pkgver=0.0.28
+pkgrel=1
 pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance"
 arch=('x86_64')
 provides=("${_pkgname}")
@@ -32,31 +32,27 @@ optdepends=(
 	'xdg-utils: Open files'
 	'rizin: Allow patching Krisp support'
 )
-source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz"
+source=("https://dl.discordapp.net/apps/linux/${pkgver}/${_pkgname}-${pkgver}.tar.gz"
 	'discord-launcher.sh')
-sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f'
-            '4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0')
+sha512sums=('763fe47a0fb21a13e852bcc818d4e0e2ea4faf23fcfdc02fddfe06e8c829499e028e27b45d807d3b3edcc36788990f3f21c0460b9b8efc538b62f3b41aeb744d'
+            'f516b1dba10f423f1ebe69b14f70740232b19d343b603c3479ba1e1dd2b7bcf472e92d354fde3a9d553bfae78207ae0420be60372a4b38ba78c3421172230826')
 
-_krisp_b2sum='592f55259500afc0d7fd334a10d3c1991fae05db870bf12437edc43cf693988195341f2cb827aba333c0e65fb4cb40dccfcc5d6a84dea4a1645f9563505b6496'
+_krisp_b2sum='56c8c5167e3c4b51720accf0acfe46e7e073b015600088b6bb4d2b7a259cd788c4facba2d7332b535cfa39b91ee94840d6ea905c5d0c9cca43fa0a26f5185cc9'
 
 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
 
 	# fix the .desktop file
-	sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" Discord/$_pkgname.desktop
+	sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" ${_pkgname^}/$_pkgname.desktop
 
 	# create the license files
 	curl https://discord.com/terms | html2text >"${srcdir}"/LICENSE.md
 	curl https://discord.com/licenses | html2text >"${srcdir}"/OSS-LICENSES.md
 }
 
-package() {
-	# create necessary directories
-	install -d "${pkgdir}"/usr/{lib/$_pkgname,bin}
-	install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname}
-
-	cd "${srcdir}/Discord"
+build() {
+	cd "${srcdir}"/${_pkgname^}
 
 	# use system electron
 	asar e resources/app.asar resources/app
@@ -65,16 +61,20 @@ package() {
 	sed -i "s|exeDir,|'/usr/share/pixmaps',|" resources/app/app_bootstrap/autoStart/linux.js
 	asar p resources/app resources/app.asar
 	rm -rf resources/app
+}
+
+package() {
+	# create necessary directories
+	install -d "${pkgdir}"/usr/{lib/$_pkgname,bin}
+	install -d "${pkgdir}"/usr/share/{pixmaps,applications,licenses/$_pkgname}
 
 	# copy relevant data
-	cp -r resources/* "${pkgdir}"/usr/lib/$_pkgname/
-	cp $_pkgname.png \
+	cp -r ${_pkgname^}/resources/* "${pkgdir}"/usr/lib/$_pkgname/
+	cp ${_pkgname^}/$_pkgname.png \
 		"${pkgdir}"/usr/share/pixmaps/$_pkgname.png
-	cp $_pkgname.desktop \
+	cp ${_pkgname^}/$_pkgname.desktop \
 		"${pkgdir}"/usr/share/applications/$_pkgname.desktop
 
-	cd "${srcdir}"
-
 	# install the launch script
 	install -Dm 755 discord-launcher.sh "${pkgdir}"/usr/bin/$_pkgname
 

discord-electron/discord-launcher.sh

@@ -31,7 +31,7 @@ EOF
 fi
 
 for line in "${MAPFILE[@]}"; do
-	if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
+	if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then
 		flags+=("${line}")
 	fi
 done

gvisor-bin/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = gvisor-bin
 	pkgdesc = OCI container sandbox runtime focused on security, efficiency, and ease of use
-	pkgver = 20230605.0
+	pkgver = 20230710.0
 	pkgrel = 1
 	url = https://gvisor.dev
 	arch = x86_64
@@ -9,13 +9,13 @@ pkgbase = gvisor-bin
 	optdepends = docker: for Docker runtime support
 	provides = gvisor
 	conflicts = gvisor
-	source_x86_64 = runsc-x86_64-20230605.0::https://storage.googleapis.com/gvisor/releases/release/20230605.0/x86_64/runsc
-	source_x86_64 = containerd-shim-runsc-v1-x86_64-20230605.0::https://storage.googleapis.com/gvisor/releases/release/20230605.0/x86_64/containerd-shim-runsc-v1
-	sha512sums_x86_64 = b96374f8b5a13c5fd51097cc16032b55241e2a0c6d286657d9a1ca7198be2b587d85aa595b69527858121cda63e1cde5cfb49fb57864d2c320ce356c4271f4f6
-	sha512sums_x86_64 = e3555d7be221a855148e1a4aec81a9ba217c31cd2d83bb35108eeb98b332f1df22eca2fdaaeff82a6cd452046aa72ccc8800890b2ee1a85497862ffd2c8158fb
-	source_aarch64 = runsc-aarch64-20230605.0::https://storage.googleapis.com/gvisor/releases/release/20230605.0/aarch64/runsc
-	source_aarch64 = containerd-shim-runsc-v1-aarch64-20230605.0::https://storage.googleapis.com/gvisor/releases/release/20230605.0/aarch64/containerd-shim-runsc-v1
-	sha512sums_aarch64 = d959d727e78769d4f1bb2b7c15a557df02611b3bc7349fae02416d206403c5f5e442bcbd60389498fe5bcce4eb7d23385294bacfbd845eeda3746e4cdd681de2
-	sha512sums_aarch64 = a1f7288e8d6301ccfe97f4d28aa44d429535e3a577c6b9db32553f2b82b27eb08763ba8232b92c77445418c474d0df7fbf06f6fd24b3da82a7e0ecfc455e3f11
+	source_x86_64 = runsc-x86_64-20230710.0::https://storage.googleapis.com/gvisor/releases/release/20230710.0/x86_64/runsc
+	source_x86_64 = containerd-shim-runsc-v1-x86_64-20230710.0::https://storage.googleapis.com/gvisor/releases/release/20230710.0/x86_64/containerd-shim-runsc-v1
+	sha512sums_x86_64 = 40fe7f27de606c2ee35cf93e165b21502cf4c01610601a8b320a923785457ddd2353e5d519a7907ba7ef1b42577fce1c38d5c7d104e7a18f165cdf4d2124c030
+	sha512sums_x86_64 = 61723a7a40ac826fd688a564e5a15843415032b29ec1582f526b08abcfb8c8f260f0106f09a6c8886cf16349268a1157e8a55ec27cf0d4db0945c5e9fe535eb4
+	source_aarch64 = runsc-aarch64-20230710.0::https://storage.googleapis.com/gvisor/releases/release/20230710.0/aarch64/runsc
+	source_aarch64 = containerd-shim-runsc-v1-aarch64-20230710.0::https://storage.googleapis.com/gvisor/releases/release/20230710.0/aarch64/containerd-shim-runsc-v1
+	sha512sums_aarch64 = b7a4962f8cb267a45b623ec2a5fcd2da33f5849e9e036a34b1cb95e7fd559a0706d964c9d9aa07235d20abc2fe981ea244adcd05a3ff76263fcabb4d06690a94
+	sha512sums_aarch64 = d50c7c661a5ff7de8ed0b5533f979f26946590dcf2b207e99846015358242aca61e2ea800f730c93940c109fdb4cf709fe428a9a8bf90218dc53d3a5b2dc5871
 
 pkgname = gvisor-bin

gvisor-bin/PKGBUILD

@@ -4,7 +4,7 @@
 pkgname='gvisor-bin'
 _pkgbin='runsc'
 _pkgshim='containerd-shim-runsc-v1'
-pkgver=20230605.0
+pkgver=20230710.0
 pkgrel=1
 pkgdesc='OCI container sandbox runtime focused on security, efficiency, and ease of use'
 arch=('x86_64' 'aarch64')
@@ -25,10 +25,10 @@ source_aarch64=(
 	"$_pkgbin-aarch64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgbin"
 	"$_pkgshim-aarch64-$pkgver::https://storage.googleapis.com/${pkgname%-bin}/releases/release/$pkgver/aarch64/$_pkgshim"
 )
-sha512sums_x86_64=('b96374f8b5a13c5fd51097cc16032b55241e2a0c6d286657d9a1ca7198be2b587d85aa595b69527858121cda63e1cde5cfb49fb57864d2c320ce356c4271f4f6'
-                   'e3555d7be221a855148e1a4aec81a9ba217c31cd2d83bb35108eeb98b332f1df22eca2fdaaeff82a6cd452046aa72ccc8800890b2ee1a85497862ffd2c8158fb')
-sha512sums_aarch64=('d959d727e78769d4f1bb2b7c15a557df02611b3bc7349fae02416d206403c5f5e442bcbd60389498fe5bcce4eb7d23385294bacfbd845eeda3746e4cdd681de2'
-                    'a1f7288e8d6301ccfe97f4d28aa44d429535e3a577c6b9db32553f2b82b27eb08763ba8232b92c77445418c474d0df7fbf06f6fd24b3da82a7e0ecfc455e3f11')
+sha512sums_x86_64=('40fe7f27de606c2ee35cf93e165b21502cf4c01610601a8b320a923785457ddd2353e5d519a7907ba7ef1b42577fce1c38d5c7d104e7a18f165cdf4d2124c030'
+                   '61723a7a40ac826fd688a564e5a15843415032b29ec1582f526b08abcfb8c8f260f0106f09a6c8886cf16349268a1157e8a55ec27cf0d4db0945c5e9fe535eb4')
+sha512sums_aarch64=('b7a4962f8cb267a45b623ec2a5fcd2da33f5849e9e036a34b1cb95e7fd559a0706d964c9d9aa07235d20abc2fe981ea244adcd05a3ff76263fcabb4d06690a94'
+                    'd50c7c661a5ff7de8ed0b5533f979f26946590dcf2b207e99846015358242aca61e2ea800f730c93940c109fdb4cf709fe428a9a8bf90218dc53d3a5b2dc5871')
 
 package() {
 	install -Dm 755 "$_pkgbin-$CARCH-$pkgver" "$pkgdir/usr/bin/$_pkgbin"

gvisor-git/.SRCINFO

@@ -1,6 +1,6 @@
 pkgbase = gvisor-git
 	pkgdesc = OCI container sandbox runtime focused on security, efficiency, and ease of use
-	pkgver = 20230605.0
+	pkgver = 20230710.0
 	pkgrel = 1
 	url = https://gvisor.dev
 	arch = x86_64

gvisor-git/PKGBUILD

@@ -4,7 +4,7 @@
 pkgname='gvisor-git'
 _pkgbin='runsc'
 _pkgshim='containerd-shim-runsc-v1'
-pkgver=20230605.0
+pkgver=20230710.0
 pkgrel=1
 pkgdesc='OCI container sandbox runtime focused on security, efficiency, and ease of use'
 arch=('x86_64' 'aarch64')

obs-vkcapture/.SRCINFO

@@ -1,5 +1,5 @@
 pkgbase = obs-vkcapture
-	pkgver = 1.4.0
+	pkgver = 1.4.1
 	pkgrel = 1
 	url = https://github.com/nowrep/obs-vkcapture
 	arch = x86_64
@@ -15,8 +15,8 @@ pkgbase = obs-vkcapture
 	depends = libgl
 	depends = libegl
 	depends = obs-studio>=27
-	source = https://github.com/nowrep/obs-vkcapture/archive/v1.4.0/obs-vkcapture-1.4.0.tar.gz
-	sha512sums = 8b487a09d54ada2482f218eb0b7d22228ca8bdb8ed7b71e8b9456554e48a2d2de80fc94ce336de1b574842b9839c402a98902039696df36a002e3f9e850b936d
+	source = https://github.com/nowrep/obs-vkcapture/archive/v1.4.1/obs-vkcapture-1.4.1.tar.gz
+	sha512sums = 3fa64486df0966f8e33262f821833a9a37a9d2a0e27fb9c6ffc9393e5c829444b995155aa54ddc60ab2cb07ca4f7f01c6581dc6c550335a26fddebd46ff604df
 
 pkgname = obs-vkcapture
 	pkgdesc = OBS Linux Vulkan/OpenGL game capture

obs-vkcapture/PKGBUILD

@@ -2,7 +2,7 @@
 
 pkgbase=obs-vkcapture
 pkgname=("$pkgbase" "lib32-$pkgbase")
-pkgver=1.4.0
+pkgver=1.4.1
 pkgrel=1
 url="https://github.com/nowrep/$pkgbase"
 license=('GPL2')
@@ -10,7 +10,7 @@ arch=('x86_64')
 depends=('vulkan-icd-loader' 'libgl' 'libegl' 'obs-studio>=27')
 makedepends=('gcc' 'cmake' 'vulkan-headers' 'lib32-gcc-libs' 'lib32-vulkan-icd-loader' 'lib32-libgl' 'lib32-libegl')
 source=("https://github.com/nowrep/$pkgbase/archive/v$pkgver/$pkgbase-$pkgver.tar.gz")
-sha512sums=('8b487a09d54ada2482f218eb0b7d22228ca8bdb8ed7b71e8b9456554e48a2d2de80fc94ce336de1b574842b9839c402a98902039696df36a002e3f9e850b936d')
+sha512sums=('3fa64486df0966f8e33262f821833a9a37a9d2a0e27fb9c6ffc9393e5c829444b995155aa54ddc60ab2cb07ca4f7f01c6581dc6c550335a26fddebd46ff604df')
 
 build() {
 	cmake -B build -S "$pkgbase-$pkgver" \