summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-23 18:47:37 +0800
committerzxp198210052024-02-23 18:47:37 +0800
commit905c2cbe1f4fa07752b3e3cee337f85135d011d0 (patch)
tree5a89f164379f79f5ca6aee3521c2d14d19046feb
parent3c3386975c726e5ae0abaf95d6c8e754f5a735f4 (diff)
downloadaur-905c2cbe1f4fa07752b3e3cee337f85135d011d0.tar.gz
fix errors
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD11
-rw-r--r--loopy-desktop.sh9
3 files changed, 13 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 1b7b73ea5f9e..5ad7e342cfc5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = loopy-desktop
pkgdesc = A tool for thinking in systems
pkgver = 1.2.1
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/jchu634/loopy-desktop
arch = any
license = MIT
@@ -15,6 +15,6 @@ pkgbase = loopy-desktop
source = loopy-desktop.git::git+https://github.com/jchu634/loopy-desktop.git#tag=v1.2.1
source = loopy-desktop.sh
sha256sums = SKIP
- sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+ sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
pkgname = loopy-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 48705cd007d6..0c261e31431e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=loopy-desktop
pkgver=1.2.1
_electronversion=21
-pkgrel=4
+pkgrel=5
pkgdesc="A tool for thinking in systems"
arch=('any')
url="https://github.com/jchu634/loopy-desktop"
@@ -23,18 +23,21 @@ source=(
"${pkgname}.sh"
)
sha256sums=('SKIP'
- 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+ '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-e "s|@appname@|${pkgname}|g" \
- -e "s|@appasar@|app.asar|g" \
+ -e "s|@runname@|app.asar|g" \
-i "${srcdir}/${pkgname}.sh"
- gendesk -f -n -q --categories "Utility" --name "${pkgname}" --exec "${pkgname} %U"
+ gendesk -f -n -q --categories="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')"
+ export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
export ELECTRONVERSION="${_electronversion}"
+ export npm_config_disturl=https://electronjs.org/headers
+ HOME="${srcdir}/.electron-gyp"
yarn install --cache-folder "${srcdir}/.yarn_cache"
yarn run dist
}
diff --git a/loopy-desktop.sh b/loopy-desktop.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/loopy-desktop.sh
+++ b/loopy-desktop.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