diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | PKGBUILD | 22 | ||||
| -rw-r--r-- | ghost-chat.sh | 14 |
3 files changed, 27 insertions, 22 deletions
@@ -1,21 +1,20 @@ pkgbase = ghost-chat pkgdesc = A standalone, multiplatform Twitch.tv chat as overlay on windowed/windowed fullscreen applications. - pkgver = 3.1.0 + pkgver = 3.1.1 pkgrel = 1 url = https://github.com/Enubia/ghost-chat arch = any license = Zlib - makedepends = pnpm + makedepends = pnpm>=9 makedepends = gendesk makedepends = npm - makedepends = nodejs - makedepends = git + makedepends = nvm makedepends = curl depends = electron30 conflicts = ghost-chat - source = ghost-chat-3.1.0.tar.gz::https://github.com/Enubia/ghost-chat/archive/refs/tags/v3.1.0.tar.gz + source = ghost-chat-3.1.1.tar.gz::https://github.com/Enubia/ghost-chat/archive/refs/tags/v3.1.1.tar.gz source = ghost-chat.sh - sha256sums = 8cf136f096b65e41df2be89f3d7e7760333d7700fb9b8b39363b3e6f3dd91578 - sha256sums = 61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3 + sha256sums = 84ba5f1fea5912d54f7b4de5026fea5086dd39ec2874057f7227ed80bfd150cf + sha256sums = 05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a pkgname = ghost-chat @@ -1,7 +1,7 @@ # Maintainer: zxp19821005 <zxp19821005 at 163 dot com> pkgname=ghost-chat _pkgname=GhostChat -pkgver=3.1.0 +pkgver=3.1.1 _electronversion=30 _nodeversion=20 pkgrel=1 @@ -14,19 +14,18 @@ depends=( "electron${_electronversion}" ) makedepends=( - 'pnpm' + 'pnpm>=9' 'gendesk' 'npm' - 'nodejs' - 'git' + 'nvm' 'curl' ) source=( "${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz" "${pkgname}.sh" ) -sha256sums=('8cf136f096b65e41df2be89f3d7e7760333d7700fb9b8b39363b3e6f3dd91578' - '61d56055897e9d71d68e185ac2de7c4cb2fbca16eb3fb0091703612c113441f3') +sha256sums=('84ba5f1fea5912d54f7b4de5026fea5086dd39ec2874057f7227ed80bfd150cf' + '05762c556c85a4423b28600ccbbe7b7dcdd3d1be526ef4a588a510671fa6c62a') _ensure_local_nvm() { export NVM_DIR="${srcdir}/.nvm" source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]] @@ -47,23 +46,22 @@ build() { export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')" export npm_config_target="${SYSTEM_ELECTRON_VERSION}" export ELECTRONVERSION="${_electronversion}" - export npm_config_disturl=https://electronjs.org/headers HOME="${srcdir}/.electron-gyp" 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 export npm_config_registry=https://registry.npmmirror.com + export npm_config_disturl=https://electronjs.org/headers export npm_config_electron_mirror=https://registry.npmmirror.com/-/binary/electron/ export npm_config_electron_builder_binaries_mirror=https://registry.npmmirror.com/-/binary/electron-builder-binaries/ else echo "Your network is OK." fi - sed "s|\/\${version}||g;s|\/\/ ||g;s|AppImage|dir|g" -i electron-builder.config.js - mv public/icons/icon-512x125.png public/icons/icon-512x512.png - npm add pnpm - npx pnpm install --no-lockfile - npx pnpm run release + sed "s|out\/release\/\${version}|release|g;s|\/\/ ||g;s|AppImage|dir|g" -i electron-builder.config.js + cp public/icons/icon-512x125.png public/icons/icon-512x512.png + pnpm install --no-lockfile + pnpm run release } package() { install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}" diff --git a/ghost-chat.sh b/ghost-chat.sh index 842c77e19b1d..5594e5380ba2 100644 --- a/ghost-chat.sh +++ b/ghost-chat.sh @@ -7,14 +7,22 @@ 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 ELECTRON_DISABLE_SECURITY_WARNINGS=true +export ELECTRON_OVERRIDE_DIST_PATH="/usr/bin/electron@electronversion@" export NODE_ENV=production export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" _FLAGS_FILE="${XDG_CONFIG_HOME}/@appname@-flags.conf" -if [ -r "${_FLAGS_FILE}" ]; then - _USER_FLAGS="$(cat "${_FLAGS_FILE}")" +declare -a flags +if [[ -f "${_FLAGS_FILE}" ]]; then + mapfile -t < "${_FLAGS_FILE}" fi +for line in "${MAPFILE[@]}"; do + if [[ ! "${line}" =~ ^[[:space:]]*#.* ]] && [[ -n "${line}" ]]; then + flags+=("${line}") + fi +done cd "${_APPDIR}" -if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then +if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "${_USER_FLAGS}" "$@" || exit $? else exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "${_USER_FLAGS}" "$@" || exit $? |