From 43f77b91676d59ea1c4adcef522a7e87140515b5 Mon Sep 17 00:00:00 2001 From: ArjixWasTaken Date: Wed, 15 Oct 2025 22:44:08 +0000 Subject: [PATCH] init equicord-openasar --- .SRCINFO | 12 ++++++---- PKGBUILD | 68 ++++++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 62 insertions(+), 18 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index af60d778beea..db05233769f1 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ -pkgbase = equicord - pkgdesc = The other cutest Discord client mod - pkgver = 0.0.112.g0a53784d +pkgbase = equicord-openasar + pkgdesc = The other cutest Discord client mod (with OpenAsar) + pkgver = 0.0.112.r5527ga5ed19ab.r846gbf8a71e pkgrel = 1 url = https://equicord.org/ arch = x86_64 @@ -18,15 +18,19 @@ pkgbase = equicord optdepends = libpulse: PulseAudio support optdepends = libappindicator-gtk3: Systray indicator support optdepends = xdg-utils: For opening URLs and files + provides = equicord + conflicts = equicord options = !debug options = !strip source = equicord-source::git+https://github.com/Equicord/Equicord.git + source = openasar-source::git+https://github.com/GooseMod/OpenAsar.git source = discord-pkgbuild::https://gitlab.archlinux.org/archlinux/packaging/packages/discord/-/raw/main/PKGBUILD source = equicord.desktop source = equicord.png sha512sums = SKIP sha512sums = SKIP + sha512sums = SKIP sha512sums = 25c3e3cbef8c981a42ba059f589ffc9ebe8c81406fa6cd6b000ed7b4e3c7b95ae96108df2a29096a8c527153b3becf98b1769b2af75d5f6cf0fe69edd2b3da3a sha512sums = 94f091c05c365986d556616404e00344a1d8e4ba93ad1875c0d3d96b1d0a643a799343fe6b84dcf7013ea3f9d47a3380540d8212bbf3fb6f5ddf39840ffe38d5 -pkgname = equicord +pkgname = equicord-openasar diff --git a/PKGBUILD b/PKGBUILD index 6ec83f4e9886..e86f5ed2e77c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,11 +3,11 @@ # shellcheck shell=bash # shellcheck disable=SC2034,SC2154,SC2155,SC2164 -pkgname=equicord -_pkgname=Equicord -pkgver=0.0.112.g0a53784d +pkgname=equicord-openasar +_pkgname=equicord +pkgver=0.0.112.r5527ga5ed19ab.r846gbf8a71e pkgrel=1 -pkgdesc='The other cutest Discord client mod' +pkgdesc='The other cutest Discord client mod (with OpenAsar)' arch=('x86_64') url='https://equicord.org/' license=('custom') @@ -17,22 +17,48 @@ optdepends=('libpulse: PulseAudio support' 'libappindicator-gtk3: Systray indicator support' 'xdg-utils: For opening URLs and files') makedepends=('git' 'nvm' 'pnpm' 'wget' 'asar') +provides=("$_pkgname") +conflicts=("$_pkgname") source=( 'equicord-source::git+https://github.com/Equicord/Equicord.git' + 'openasar-source::git+https://github.com/GooseMod/OpenAsar.git' 'discord-pkgbuild::https://gitlab.archlinux.org/archlinux/packaging/packages/discord/-/raw/main/PKGBUILD' 'equicord.desktop' 'equicord.png' ) sha512sums=('SKIP' + 'SKIP' 'SKIP' '25c3e3cbef8c981a42ba059f589ffc9ebe8c81406fa6cd6b000ed7b4e3c7b95ae96108df2a29096a8c527153b3becf98b1769b2af75d5f6cf0fe69edd2b3da3a' '94f091c05c365986d556616404e00344a1d8e4ba93ad1875c0d3d96b1d0a643a799343fe6b84dcf7013ea3f9d47a3380540d8212bbf3fb6f5ddf39840ffe38d5') pkgver() { local discord_ver=$(grep -oE '^pkgver=(.*?)$' discord-pkgbuild) - local commit_sha=$(cd equicord-source && git rev-parse --short HEAD) + local equicord_ver + { + local commits sha - echo "${discord_ver#pkgver=}.g${commit_sha}" + pushd equicord-source + commits=$(git rev-list --count HEAD) + sha=$(git rev-parse --short HEAD) + popd + + equicord_ver="r${commits}g${sha}" + } > /dev/null + + local openasar_ver + { + local commits sha + + pushd openasar-source + commits=$(git rev-list --count HEAD) + sha=$(git rev-parse --short HEAD) + popd + + openasar_ver="r${commits}g${sha}" + } > /dev/null + + echo "${discord_ver#pkgver=}.${equicord_ver}.${openasar_ver}" } _ensure_local_nvm() { @@ -54,11 +80,21 @@ prepare() { nvm install --lts pnpm install --frozen-lockfile popd + + pushd openasar-source + sed -i -e "s|nightly|nightly-$(git rev-parse HEAD | cut -c 1-7)|" src/index.js + sed -i -e "/config.setup = true/a\ config.autoupdate = false;" src/config/index.js + sed -i -e "s|process.resourcesPath|'/usr/lib/${_pkgname}/resources'|" src/utils/buildInfo.js + sed -i -e "s|^Exec=\${exec}$|Exec=/usr/bin/${_pkgname}|" \ + -e "s|^Name=\${basename(exec)}$|Name=${_pkgname^}|" src/autoStart.js + node scripts/strip.js + asar pack src app.asar + popd } build() { export PNPM_HOME="$srcdir/pnpm-home" - local discord_ver="${pkgver%%.g*}" + local discord_ver="${pkgver%%.r*}" echo "Downloading discord: v$discord_ver" wget "https://dl.discordapp.net/apps/linux/$discord_ver/discord-$discord_ver.tar.gz" \ @@ -81,7 +117,7 @@ build() { rm postinst.sh pushd resources - mv app.asar _app.asar + rm app.asar mkdir app echo '{"name": "discord", "main": "index.js"}' > app/package.json @@ -90,6 +126,10 @@ build() { rm -rf app popd popd + + pushd openasar-source + cp app.asar "../discord-${discord_ver}/resources/_app.asar" + popd pushd equicord-source _ensure_local_nvm @@ -103,17 +143,17 @@ build() { } package() { - local discord="discord-${pkgver%%.g*}" + local discord="discord-${pkgver%%.r*}" - install -d "$pkgdir/usr/lib/$pkgname" - cp -a "$discord/." "$pkgdir/usr/lib/$pkgname" + install -d "$pkgdir/usr/lib/$_pkgname" + cp -a "$discord/." "$pkgdir/usr/lib/$_pkgname" install -d "$pkgdir/usr/bin" - ln -s "/usr/lib/$pkgname/Discord" "$pkgdir/usr/bin/$pkgname" + ln -s "/usr/lib/${_pkgname}/Discord" "$pkgdir/usr/bin/${_pkgname}" install -d "$pkgdir/usr/share/applications" - ln -s "/usr/lib/$pkgname/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" + ln -s "/usr/lib/${_pkgname}/${_pkgname}.desktop" "$pkgdir/usr/share/applications/${_pkgname}.desktop" install -d "$pkgdir/usr/share/icons/hicolor/256x256/apps" - ln -s "/usr/lib/$pkgname/$pkgname.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/$pkgname.png" + ln -s "/usr/lib/${_pkgname}/${_pkgname}.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/${_pkgname}.png" }