summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-07-11 17:38:26 +0800
committerzxp198210052024-07-11 17:38:26 +0800
commitc277b2e78cfb4260a6f288997add741a2922e99a (patch)
treeca5ee5ccd2d099c7f2a3615c73f795f148030bb8
parent46459d4ff254088cab58c6aafa6b244910049a4e (diff)
downloadaur-c277b2e78cfb4260a6f288997add741a2922e99a.tar.gz
fix errors
Diffstat
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD32
-rw-r--r--own3d-desktop.sh21
3 files changed, 43 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 25a75cca62df..5e64f2b70fb8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
pkgbase = own3d-desktop-git
pkgdesc = Public Development Preview of the OWN3D Desktop App
- pkgver = 2.0.0.r2.g245f401
+ pkgver = 2.1.1.r0.g8aecf0a
pkgrel = 1
url = https://www.own3d.pro/
arch = any
license = MIT
makedepends = npm
makedepends = git
- makedepends = nodejs
+ makedepends = nvm
makedepends = gendesk
+ makedepends = curl
depends = electron29
- provides = own3d-desktop=2.0.0
+ provides = own3d-desktop=2.1.1
conflicts = own3d-desktop
source = own3d-desktop.git::git+https://github.com/own3d/desktop.git
source = own3d-desktop.sh
sha256sums = SKIP
- sha256sums = dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8
+ sha256sums = 2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051
pkgname = own3d-desktop-git
diff --git a/PKGBUILD b/PKGBUILD
index acfdca10d27a..589bfe0080e6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,9 @@
# Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
pkgname=own3d-desktop-git
_pkgname="OWN3D Pro Desktop"
-pkgver=2.0.0.r2.g245f401
+pkgver=2.1.1.r0.g8aecf0a
_electronversion=29
+_nodeversion=20
pkgrel=1
pkgdesc="Public Development Preview of the OWN3D Desktop App"
arch=('any')
@@ -17,44 +18,53 @@ depends=(
makedepends=(
'npm'
'git'
- 'nodejs'
+ 'nvm'
'gendesk'
+ 'curl'
)
source=(
"${pkgname%-git}.git::git+${_ghurl}.git"
"${pkgname%-git}.sh")
sha256sums=('SKIP'
- 'dc0c5ca385ad81a08315a91655c7c064b5bf110eada55e61265633ae198b39f8')
+ '2b2e8aeed33fd71c521e49fd54fb2fa81218d16aef8bccb88d77909055ab8051')
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'
+ git describe --long --tags --abbrev=7 | sed 's/\([^-]*-g\)/r\1/;s/-/./g;s/v//g'
+}
+_ensure_local_nvm() {
+ export NVM_DIR="${srcdir}/.nvm"
+ source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+ nvm install "${_nodeversion}"
+ nvm use "${_nodeversion}"
}
build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-e "s|@appname@|${pkgname%-git}|g" \
-e "s|@runname@|app.asar|g" \
+ -e "s|@cfgdirname@|${_pkgname}|g" \
-e "s|@options@|env ELECTRON_OZONE_PLATFORM_HINT=auto|g" \
-i "${srcdir}/${pkgname%-git}.sh"
- gendesk -q -f -n --categories="Game" --name="${_pkgname}" --exec="${pkgname%-git} %U"
+ _ensure_local_nvm
+ gendesk -q -f -n --pkgname="${pkgname%-git}" --pkgdesc="${pkgdesc}" --categories="Game" --name="${_pkgname}" --exec="${pkgname%-git} %U"
cd "${srcdir}/${pkgname%-git}.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
+ #export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+ #export npm_config_target="${SYSTEM_ELECTRON_VERSION}"
+ #export ELECTRONVERSION="${_electronversion}"
HOME="${srcdir}/.electron-gyp"
mkdir -p "${srcdir}/.electron-gyp"
touch "${srcdir}/.electron-gyp/.yarnrc"
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://registry.npmmirror.com/-/binary/node/
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
- yarn install --cache-folder "${srcdir}/.yarn_cache"
- yarn run package
+ NODE_ENV=development yarn install --cache-folder "${srcdir}/.yarn_cache"
+ NODE_ENV=production yarn run package
}
package() {
install -Dm755 "${srcdir}/${pkgname%-git}.sh" "${pkgdir}/usr/bin/${pkgname%-git}"
diff --git a/own3d-desktop.sh b/own3d-desktop.sh
index 7ddcaab8d734..4cfe3ac09dd8 100644
--- a/own3d-desktop.sh
+++ b/own3d-desktop.sh
@@ -1,16 +1,29 @@
#!/bin/bash
-set -e
+set -o pipefail
_APPDIR="/usr/lib/@appname@"
_RUNNAME="${_APPDIR}/@runname@"
+_CFGDIR="@cfgdirname@/"
_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 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}"
+export _FLAGS_FILE="${XDG_CONFIG_HOME}/${_CFGDIR}@appname@-flags.conf"
+declare -a _USER_FLAGS
+if [[ -f "${_FLAGS_FILE}" ]]; then
+ while read -r line; do
+ if [[ ! "${line}" =~ ^[[:space:]]*#.* ]]; then
+ _USER_FLAGS+=("${line}")
+ fi
+ done < "${_FLAGS_FILE}"
+fi
cd "${_APPDIR}"
-if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" "$@" || exit $?
+if [[ "${EUID}" -ne 0 ]] || [[ "${ELECTRON_RUN_AS_NODE}" ]]; then
+ exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} "${_USER_FLAGS[@]}" "$@"
else
- exec electron@electronversion@ "${_RUNNAME}" "${_OPTIONS}" --no-sandbox "$@" || exit $?
+ exec electron@electronversion@ "${_RUNNAME}" ${_OPTIONS} --no-sandbox "${_USER_FLAGS[@]}" "$@"
fi \ No newline at end of file