summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-04 00:27:11 +0800
committerzxp198210052024-02-04 00:27:11 +0800
commit26782e91a238f3254af484050942b7a1d60a31c6 (patch)
tree352934c8eefdcde1646c69d8aa1056bd61c69df0
parent767c87cf81d76fdfb5b30c5c07c0bf4ef4077987 (diff)
downloadaur-26782e91a238f3254af484050942b7a1d60a31c6.tar.gz
update to 1.2.3.r3.g18c1e30
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD8
-rw-r--r--zxinfo-file-browser.sh9
3 files changed, 11 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f45182e2ffe1..f7388052d4f8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = zxinfo-file-browser-git
pkgdesc = Organize and manage your emulator files for ZX Spectrum & ZX 81 - powered by the web
- pkgver = 1.2.3.r2.g625caf6
+ pkgver = 1.2.3.r3.g18c1e30
pkgrel = 1
url = https://github.com/thomasheckmann/zxinfo-file-browser
arch = any
@@ -15,6 +15,6 @@ pkgbase = zxinfo-file-browser-git
source = zxinfo-file-browser.git::git+https://github.com/thomasheckmann/zxinfo-file-browser.git
source = zxinfo-file-browser.sh
sha256sums = SKIP
- sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+ sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
pkgname = zxinfo-file-browser-git
diff --git a/PKGBUILD b/PKGBUILD
index f6b78a6ade4d..0b85ec6fdefa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
pkgname=zxinfo-file-browser-git
_pkgname="ZXINFO File Browser"
-pkgver=1.2.3.r2.g625caf6
+pkgver=1.2.3.r3.g18c1e30
_electronversion=27
_nodeversion=18
pkgrel=1
@@ -25,7 +25,7 @@ source=(
"${pkgname%-git}.sh"
)
sha256sums=('SKIP'
- 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+ '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
pkgver() {
cd "${srcdir}/${pkgname%-git}.git"
git describe --long --tags --exclude='*[a-z][a-z]*' | sed -E 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
@@ -39,7 +39,7 @@ _ensure_local_nvm() {
build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-e "s|@appname@|${pkgname%-git}|g" \
- -e "s|@appasar@|app|g" \
+ -e "s|@runname@|app|g" \
-i "${srcdir}/${pkgname%-git}.sh"
_ensure_local_nvm
gendesk -q -f -n --categories "Game" --name "${_pkgname}" --exec "${pkgname%-git} %U"
@@ -49,6 +49,8 @@ build() {
export ELECTRON_SKIP_BINARY_DOWNLOAD=1
export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
export ELECTRONVERSION="${_electronversion}"
+ export npm_config_disturl=https://electronjs.org/headers
+ HOME="${srcdir}/.electron-gyp"
sed "s|-mwl|-l|g" -i package.json
npm ci
npm run build
diff --git a/zxinfo-file-browser.sh b/zxinfo-file-browser.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/zxinfo-file-browser.sh
+++ b/zxinfo-file-browser.sh
@@ -1,15 +1,14 @@
#!/bin/sh
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 NODE_ENV=production
cd "${_APPDIR}"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_ASAR}" "$@"
+ exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
else
- exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit \ No newline at end of file
+ exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi \ No newline at end of file