discord_arch_electron: v0.0.12-4: apply code from @huyizheng, thanks!

This commit is contained in:
John C. Allwein 2020-11-19 09:29:58 -05:00
parent 9cbb7d1fd7
commit bfc3b24c7e
WARNING! Although there is a key with this ID in the database it does not verify this commit! This commit is SUSPICIOUS.
GPG key ID: 50982AE5B444BE15
2 changed files with 24 additions and 27 deletions

View file

@ -1,10 +1,11 @@
pkgbase = discord_arch_electron pkgbase = discord_arch_electron
pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance pkgdesc = Discord (popular voice + video app) using the system provided electron for increased security and performance
pkgver = 0.0.12 pkgver = 0.0.12
pkgrel = 3 pkgrel = 4
url = https://discordapp.com url = https://discordapp.com
arch = x86_64 arch = x86_64
license = custom license = custom
makedepends = asar
depends = electron depends = electron
optdepends = libpulse: Pulseaudio support optdepends = libpulse: Pulseaudio support
optdepends = xdg-utils: Open files optdepends = xdg-utils: Open files

View file

@ -1,10 +1,10 @@
# Maintained by johnnyapol (arch@johnnyapol.me) # Maintained by johnnyapol (arch@johnnyapol.me)
# Contributors: huyizheng
# Based off the discord community repo PKGBUILD by Filipe Laíns (FFY00) <lains@archlinux.org> # Based off the discord community repo PKGBUILD by Filipe Laíns (FFY00) <lains@archlinux.org>
pkgname=discord_arch_electron pkgname=discord_arch_electron
_pkgname=discord _pkgname=discord
pkgver=0.0.12 pkgver=0.0.12
pkgrel=3 pkgrel=4
pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance" pkgdesc="Discord (popular voice + video app) using the system provided electron for increased security and performance"
arch=('x86_64') arch=('x86_64')
provides=('discord') provides=('discord')
@ -12,6 +12,7 @@ conflicts=('discord')
url='https://discordapp.com' url='https://discordapp.com'
license=('custom') license=('custom')
depends=('electron') depends=('electron')
makedepends=('asar')
optdepends=('libpulse: Pulseaudio support' optdepends=('libpulse: Pulseaudio support'
'xdg-utils: Open files') 'xdg-utils: Open files')
source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz" source=("https://dl.discordapp.net/apps/linux/$pkgver/$_pkgname-$pkgver.tar.gz"
@ -30,31 +31,26 @@ prepare() {
package() { package() {
# Install the app # Install the app
install -d "$pkgdir"/opt/$_pkgname install -d "$pkgdir"/usr/lib/$_pkgname
# Copy Relevanat data
cp -r Discord/resources "$pkgdir"/opt/$_pkgname/
cp Discord/discord.png "$pkgdir"/opt/$_pkgname/
cp Discord/discord.desktop "$pkgdir"/opt/$_pkgname/
# Create starter script for discord
echo "#!/bin/sh" >> "$pkgdir"/opt/$_pkgname/$_pkgname
echo "exec electron /opt/$_pkgname/resources/app.asar \$@" >> "$pkgdir"/opt/$_pkgname/$_pkgname
# Set Permissions, symlinks
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 -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 # HACKS FOR SYSTEM ELECTRON
ln -s /opt/$_pkgname/resources/build_info.json "$pkgdir"/usr/lib/electron/resources/ asar e Discord/resources/app.asar Discord/resources/app
ln -s /opt/$_pkgname/discord.png "$pkgdir"/usr/lib/electron sed -i "s|process.resourcesPath|'/usr/lib/$_pkgname'|" Discord/resources/app/app_bootstrap/buildInfo.js
sed -i "s|exeDir,|'/usr/share/pixmaps',|" Discord/resources/app/app_bootstrap/autoStart/linux.js
# Copy Relevanat data
cp -r Discord/resources/* "$pkgdir"/usr/lib/$_pkgname/
rm "$pkgdir"/usr/lib/$_pkgname/app.asar
# Create starter script for discord
echo "#!/bin/sh" >> "$srcdir"/$_pkgname
echo "exec electron /usr/lib/$_pkgname/app \$@" >> "$srcdir"/$_pkgname
install -d "$pkgdir"/usr/{bin,share/{pixmaps,applications}}
install -Dm 755 $_pkgname "$pkgdir"/usr/bin/$_pkgname
cp Discord/discord.png "$pkgdir"/usr/share/pixmaps/$_pkgname.png
cp Discord/discord.desktop "$pkgdir"/usr/share/applications/$_pkgname.desktop
# Licenses # Licenses
install -Dm 644 LICENSE.html "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.html install -Dm 644 LICENSE.html "$pkgdir"/usr/share/licenses/$pkgname/LICENSE.html