diff options
| author | zxp19821005 | 2024-03-18 22:51:36 +0800 |
|---|---|---|
| committer | zxp19821005 | 2024-03-18 22:51:36 +0800 |
| commit | a1ebba7390b33a22f3037ae4c2b84abdf7a5678b (patch) | |
| tree | 4910d6ec519a6f6502466877ffd8a67488082dac | |
| parent | c63d8fb60352ff5d6612ee5dbbfeefef459f6ec8 (diff) | |
| download | aur-a1ebba7390b33a22f3037ae4c2b84abdf7a5678b.tar.gz | |
fix errors
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 14 | ||||
| -rw-r--r-- | thorium-reader.sh | 8 |
3 files changed, 18 insertions, 8 deletions
@@ -1,6 +1,6 @@ pkgbase = thorium-reader-git pkgdesc = Cross-platform desktop reading app based on the Readium Desktop toolkit - pkgver = 2.3.0.r115.gf1a77606 + pkgver = 2.3.0.r128.gad41fc04a pkgrel = 1 url = https://github.com/edrlab/thorium-reader arch = any @@ -16,6 +16,6 @@ pkgbase = thorium-reader-git source = thorium-reader.git::git+https://github.com/edrlab/thorium-reader.git source = thorium-reader.sh sha256sums = SKIP - sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014 + sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8 pkgname = thorium-reader-git @@ -1,7 +1,7 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=thorium-reader-git _pkgname="Thorium Reader" -pkgver=2.3.0.r115.gf1a77606 +pkgver=2.3.0.r128.gad41fc04a _electronversion=29 _nodeversion=20 pkgrel=1 @@ -26,7 +26,7 @@ source=( "${pkgname%-git}.sh" ) sha256sums=('SKIP' - '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014') + 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8') pkgver() { cd "${pkgname%-git}.git" git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g' @@ -41,6 +41,7 @@ build() { sed -e "s|@electronversion@|${_electronversion}|" \ -e "s|@appname@|${pkgname%-git}|g" \ -e "s|@runname@|app.asar|g" \ + -e "s|@options@||g" \ -i "${srcdir}/${pkgname%-git}.sh" _ensure_local_nvm gendesk -q -f -n --categories="Utility" --name="${_pkgname}" --exec="${pkgname%-git} %U" @@ -53,7 +54,14 @@ build() { export ELECTRONVERSION="${_electronversion}" export npm_config_disturl=https://electronjs.org/headers HOME="${srcdir}/.electron-gyp" - sed '/"deb",/d;s|--linux --x64|--linux|g' -i package.json + 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|--linux --x64 --publish never|-l --dir|g" -i package.json npm ci npm run prepackage:linux npm run package:linux diff --git a/thorium-reader.sh b/thorium-reader.sh index f9ced1432cfc..7ddcaab8d734 100644 --- a/thorium-reader.sh +++ b/thorium-reader.sh @@ -1,14 +1,16 @@ -#!/bin/sh +#!/bin/bash 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 +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 |