diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | armcord.sh | 13 |
3 files changed, 18 insertions, 17 deletions
@@ -1,7 +1,7 @@ pkgbase = armcord pkgdesc = A custom client designed to enhance your Discord experience while keeping everything lightweight. pkgver = 3.2.5 - pkgrel = 3 + pkgrel = 4 url = https://armcord.app/ arch = any license = OSL3 @@ -12,9 +12,9 @@ pkgbase = armcord makedepends = pnpm depends = electron27 conflicts = armcord - source = armcord-3.2.5::git+https://github.com/ArmCord/ArmCord.git#tag=v3.2.5 + source = armcord.git::git+https://github.com/ArmCord/ArmCord.git#tag=v3.2.5 source = armcord.sh sha256sums = SKIP - sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84 + sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231 pkgname = armcord @@ -4,7 +4,7 @@ _pkgname=ArmCord pkgver=3.2.5 _electronversion=27 _nodeversion=18 -pkgrel=3 +pkgrel=4 pkgdesc="A custom client designed to enhance your Discord experience while keeping everything lightweight." arch=('any') url="https://armcord.app/" @@ -22,11 +22,11 @@ makedepends=( 'pnpm' ) source=( - "${pkgname}-${pkgver}::git+${_ghurl}.git#tag=v${pkgver}" + "${pkgname}.git::git+${_ghurl}.git#tag=v${pkgver}" "${pkgname%-bin}.sh" ) sha256sums=('SKIP' - '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84') + 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -39,8 +39,8 @@ build() { -e "s|@appasar@|app.asar|g" \ -i "${srcdir}/${pkgname}.sh" _ensure_local_nvm - gendesk -q -f -n --categories "Network;Utility" --name "${_pkgname}" --exec "${pkgname}" - cd "${srcdir}/${pkgname}-${pkgver}" + gendesk -q -f -n --categories "Network;Utility" --name "${_pkgname}" --exec "${pkgname} %U" + cd "${srcdir}/${pkgname}.git" export npm_config_build_from_source=true export ELECTRON_SKIP_BINARY_DOWNLOAD=1 export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" @@ -54,8 +54,8 @@ build() { } package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}" - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/build/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" + install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname%-bin}" + install -Dm644 "${srcdir}/${pkgname}.git/build/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png" install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications" - install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" + install -Dm644 "${srcdir}/${pkgname}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}" }
\ No newline at end of file diff --git a/armcord.sh b/armcord.sh index 2ec4412e5c4f..aacd8f895847 100644 --- a/armcord.sh +++ b/armcord.sh @@ -1,14 +1,15 @@ -#!/bin/bash +#!/bin/sh set -e _APPDIR="/usr/lib/@appname@" +_ASAR="${_APPDIR}/@appasar@" export PATH="${_APPDIR}:${PATH}" -export ELECTRON_IS_DEV=0 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" -_ASAR="${_APPDIR}/@appasar@" +export ELECTRON_IS_DEV=0 +export NODE_ENV=production +cd "${_APPDIR}" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - cd "${_APPDIR}" exec electron@electronversion@ "${_ASAR}" "$@" else - cd "${_APPDIR}" exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@" -fi
\ No newline at end of file +fi +exit
\ No newline at end of file |