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
This commit is contained in:
parent
299ee92288
commit
374d183eea
4 changed files with 17 additions and 13 deletions
|
@ -1,7 +1,7 @@
|
||||||
pkgbase = discord-electron
|
pkgbase = discord-electron
|
||||||
pkgdesc = Discord using system provided electron (v22) for increased security and performance
|
pkgdesc = Discord using system provided electron (v22) for increased security and performance
|
||||||
pkgver = 0.0.27
|
pkgver = 0.0.27
|
||||||
pkgrel = 5
|
pkgrel = 6
|
||||||
url = https://discord.com
|
url = https://discord.com
|
||||||
install = discord-electron.install
|
install = discord-electron.install
|
||||||
arch = x86_64
|
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 = https://dl.discordapp.net/apps/linux/0.0.27/discord-0.0.27.tar.gz
|
||||||
source = discord-launcher.sh
|
source = discord-launcher.sh
|
||||||
sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f
|
sha512sums = 285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f
|
||||||
sha512sums = 1da218eb240901ed48c392c154d061b02024daeb02ee7d991cdbc97ecba30a6f06af25abb602880872d89dcc63a8cd4d149c12414086b081035938deff8fe26d
|
sha512sums = 4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0
|
||||||
|
|
||||||
pkgname = discord-electron
|
pkgname = discord-electron
|
||||||
|
|
|
@ -15,7 +15,7 @@ pkgname=discord-electron
|
||||||
_pkgname=discord
|
_pkgname=discord
|
||||||
_electron=22
|
_electron=22
|
||||||
pkgver=0.0.27
|
pkgver=0.0.27
|
||||||
pkgrel=5
|
pkgrel=6
|
||||||
pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance"
|
pkgdesc="Discord using system provided electron (v${_electron}) for increased security and performance"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
provides=("${_pkgname}")
|
provides=("${_pkgname}")
|
||||||
|
@ -34,13 +34,13 @@ optdepends=(
|
||||||
source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz"
|
source=("https://dl.discordapp.net/apps/linux/${pkgver}/discord-${pkgver}.tar.gz"
|
||||||
'discord-launcher.sh')
|
'discord-launcher.sh')
|
||||||
sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f'
|
sha512sums=('285a0119b4740402a3fa94d3679a52bc8d883413ee32187e90087960a4d34aaf316788d2708bbccafe3f995c2b99767b45bc4b7c731704ef887a8de1b3d3926f'
|
||||||
'1da218eb240901ed48c392c154d061b02024daeb02ee7d991cdbc97ecba30a6f06af25abb602880872d89dcc63a8cd4d149c12414086b081035938deff8fe26d')
|
'4bbe010c28926ca898ac33da15ce8373060af44e0583e6956671fa2ee8a2a379a88a6ff9b4f886806fc05117428834852ba2e81a9163381c678c240067b7abd0')
|
||||||
|
|
||||||
_krisp_b2sum='592f55259500afc0d7fd334a10d3c1991fae05db870bf12437edc43cf693988195341f2cb827aba333c0e65fb4cb40dccfcc5d6a84dea4a1645f9563505b6496'
|
_krisp_b2sum='592f55259500afc0d7fd334a10d3c1991fae05db870bf12437edc43cf693988195341f2cb827aba333c0e65fb4cb40dccfcc5d6a84dea4a1645f9563505b6496'
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
# prepare launcher script
|
# 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
|
# fix the .desktop file
|
||||||
sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" Discord/$_pkgname.desktop
|
sed -i "s|Exec=.*|Exec=/usr/bin/${_pkgname}|" Discord/$_pkgname.desktop
|
||||||
|
|
|
@ -5,23 +5,22 @@ post_upgrade() {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
==> The launch script will now patch Krisp noise suppression support
|
==> The launch script will now patch Krisp noise suppression support
|
||||||
if 'rizin' is installed. Restart your Discord client after update
|
if 'rizin' is installed. Restart your Discord client after update
|
||||||
to apply the patch
|
to apply the patch.
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
# return if old package version is greater than or equal to 0.0.27-2...
|
# return if old package version is greater than or equal to 0.0.27-2...
|
||||||
(( $(vercmp $2 '0.0.27-2') >= 0 )) && return
|
(( $(vercmp $2 '0.0.27-2') >= 0 )) && return
|
||||||
|
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
==> You can now add or uncomment additional Electron flags in
|
==> You can now set additional Electron flags in '~/.config/discord-flags.conf'.
|
||||||
'~/.config/discord-flags.conf' (if XDG_CONFIG_HOME is not set)
|
|
||||||
EOF
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
post_install() {
|
post_install() {
|
||||||
cat <<EOF
|
cat <<EOF
|
||||||
==> For Krisp noise suppression support consider installing 'rizin'. Restart
|
==> 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
|
==> 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
|
EOF
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,14 +2,16 @@
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
|
|
||||||
|
declare -a flags
|
||||||
|
|
||||||
|
|
||||||
flags_file="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@-flags.conf"
|
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"
|
krisp_bin="${XDG_CONFIG_HOME:-$HOME/.config}/@PKGNAME@/@PKGVER@/modules/@PKGNAME@_krisp/@PKGNAME@_krisp.node"
|
||||||
|
krisp_b2=@KRISPB2@
|
||||||
declare -a flags
|
|
||||||
|
|
||||||
if hash rizin &> /dev/null; then
|
if hash rizin &> /dev/null; then
|
||||||
# Patch Krisp binary to ignore signature check
|
# 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)
|
addr=$(rz-find -x '4889dfe8........4889dfe8' "${krisp_bin}" | head -n1)
|
||||||
rizin -q -w -c "s $addr + 0x12 ; wao nop" "${krisp_bin}" &> /dev/null
|
rizin -q -w -c "s $addr + 0x12 ; wao nop" "${krisp_bin}" &> /dev/null
|
||||||
fi
|
fi
|
||||||
|
@ -34,6 +36,9 @@ for line in "${MAPFILE[@]}"; do
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
|
|
||||||
|
unset flags_file krisp_bin krisp_b2
|
||||||
|
|
||||||
|
|
||||||
exec /usr/bin/electron@ELECTRON@ \
|
exec /usr/bin/electron@ELECTRON@ \
|
||||||
/usr/lib/@PKGNAME@/app.asar \
|
/usr/lib/@PKGNAME@/app.asar \
|
||||||
--ozone-platform-hint=auto \
|
--ozone-platform-hint=auto \
|
||||||
|
|
Loading…
Reference in a new issue