diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 17 | ||||
| -rw-r--r-- | armcord.sh | 5 |
3 files changed, 18 insertions, 10 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 = 2 + pkgrel = 3 url = https://armcord.app/ arch = any license = OSL-3.0 @@ -14,7 +14,7 @@ pkgbase = armcord conflicts = armcord source = armcord.git::git+https://github.com/ArmCord/ArmCord.git#tag=v3.2.6 source = armcord.sh - sha256sums = SKIP - sha256sums = 50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe + sha256sums = 29de843027f711985aa5545f5305b01020e0aa3263ce88c131d8caabea936a4c + sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 pkgname = armcord @@ -4,7 +4,7 @@ _pkgname=ArmCord pkgver=3.2.6 _electronversion=28 _nodeversion=18 -pkgrel=2 +pkgrel=3 pkgdesc="A custom client designed to enhance your Discord experience while keeping everything lightweight." arch=('any') url="https://armcord.app/" @@ -25,8 +25,8 @@ source=( "${pkgname}.git::git+${_ghurl}.git#tag=v${pkgver}" "${pkgname%-bin}.sh" ) -sha256sums=('SKIP' - '50b10386d13e5bec806aeb78f819c4edd0208a4d184332e53866c802731217fe') +sha256sums=('29de843027f711985aa5545f5305b01020e0aa3263ce88c131d8caabea936a4c' + 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -37,6 +37,7 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@options@||g" \ -i "${srcdir}/${pkgname}.sh" _ensure_local_nvm gendesk -q -f -n --categories="Network" --name="${_pkgname}" --exec="${pkgname} %U" @@ -51,10 +52,16 @@ build() { pnpm config set store-dir "${srcdir}/.pnpm_store" pnpm config set cache-dir "${srcdir}/.pnpm_cache" pnpm config set link-workspace-packages true + if [ `curl -s ipinfo.io/country | grep CN | wc -l ` -ge 1 ];then + echo 'registry="https://registry.npmmirror.com/"' >> .npmrc + echo 'electron_mirror="https://registry.npmmirror.com/-/binary/electron/"' >> .npmrc + echo 'electron_builder_binaries_mirror="https://registry.npmmirror.com/-/binary/electron-builder-binaries/"' >> .npmrc + else + echo "Your network is OK." + fi sed "s|icon.icns|icon.png|g" -i package.json pnpm install - pnpm run build - npx electron-builder -l AppImage + pnpm run packageQuick } package() { install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}" diff --git a/armcord.sh b/armcord.sh index 86cb3dc6a9bf..7ddcaab8d734 100644 --- a/armcord.sh +++ b/armcord.sh @@ -2,6 +2,7 @@ set -e _APPDIR="/usr/lib/@appname@" _RUNNAME="${_APPDIR}/@runname@" +_OPTIONS="@options@" export PATH="${_APPDIR}:${PATH}" export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}" export ELECTRON_IS_DEV=0 @@ -9,7 +10,7 @@ export ELECTRON_FORCE_IS_PACKAGED=true export NODE_ENV=production cd "${_APPDIR}" if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then - exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $? else - exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $? + exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $? fi
\ No newline at end of file |