diff options
| author | zxp19821005 | 2024-03-01 13:27:22 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-03-01 13:27:22 +0800 |
| commit | 72eba62bdccdb48d486bf57add33a6e1d9aae252 (patch) | |
| tree | 366df05061d71e42d667389ceea6607d2671be87 | |
| parent | e3f03d09321d3ea01637be219fb21dbcbe46a49c (diff) | |
| download | aur-72eba62bdccdb48d486bf57add33a6e1d9aae252.tar.gz | |
fix errors
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 15 | ||||
| -rw-r--r-- | armcord.sh | 9 |
3 files changed, 16 insertions, 14 deletions
@@ -1,7 +1,7 @@ pkgbase = armcord pkgdesc = A custom client designed to enhance your Discord experience while keeping everything lightweight. pkgver = 3.2.6 - pkgrel = 1 + pkgrel = 2 url = https://armcord.app/ arch = any license = OSL-3.0 @@ -10,11 +10,11 @@ pkgbase = armcord makedepends = gendesk makedepends = git makedepends = pnpm - depends = electron27 + depends = electron28 conflicts = armcord source = armcord.git::git+https://github.com/ArmCord/ArmCord.git#tag=v3.2.6 source = armcord.sh sha256sums = SKIP - sha256sums = 1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8 + sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe pkgname = armcord @@ -2,9 +2,9 @@ pkgname=armcord _pkgname=ArmCord pkgver=3.2.6 -_electronversion=27 +_electronversion=28 _nodeversion=18 -pkgrel=1 +pkgrel=2 pkgdesc="A custom client designed to enhance your Discord experience while keeping everything lightweight." arch=('any') url="https://armcord.app/" @@ -26,7 +26,7 @@ source=( "${pkgname%-bin}.sh" ) sha256sums=('SKIP' - '1d3f21d54a2d9d1a53661bd91c2afd00df79b0ce4057a66b4c953febfc464cd8') + '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -36,10 +36,10 @@ _ensure_local_nvm() { build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ - -e "s|@appasar@|app.asar|g" \ + -e "s|@runname@|app.asar|g" \ -i "${srcdir}/${pkgname}.sh" _ensure_local_nvm - gendesk -q -f -n --categories "Network;Utility" --name "${_pkgname}" --exec "${pkgname} %U" + gendesk -q -f -n --categories="Network" --name="${_pkgname}" --exec="${pkgname} %U" cd "${srcdir}/${pkgname}.git" export npm_config_build_from_source=true export ELECTRON_SKIP_BINARY_DOWNLOAD=1 @@ -51,9 +51,10 @@ build() { pnpm config set store-dir "${srcdir}/.pnpm_store" pnpm config set cache-dir "${srcdir}/.pnpm_cache" pnpm config set link-workspace-packages true - sed '/deb/d;/tar.gz/d;/rpm/d' -i package.json + sed "s|icon.icns|icon.png|g" -i package.json pnpm install - pnpm run package + pnpm run build + npx electron-builder -l AppImage } package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" diff --git a/armcord.sh b/armcord.sh index 0d20cddc70ca..86cb3dc6a9bf 100644 --- a/armcord.sh +++ b/armcord.sh @@ -1,14 +1,15 @@ -#!/bin/sh +#!/bin/bash set -e _APPDIR="/usr/lib/@appname@" -_ASAR="${_APPDIR}/@appasar@" +_RUNNAME="${_APPDIR}/@runname@" export PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" export ELECTRON_IS_DEV=0 +export ELECTRON_FORCE_IS_PACKAGED=true export NODE_ENV=production cd "${_APPDIR}" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_ASAR}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $? else - exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? fi
\ No newline at end of file |