fix errors

3 files changed, 39 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c4a567ac4fe2..0b3c598be44e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = catcat-dm-react
 	pkgdesc = catcat弹幕姬.哔哩哔哩直播弹幕姬： 查看直播间弹幕。
 	pkgver = 1.9.6
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/kokolokksk/catcat-dm-react
 	arch = any
 	license = MIT
@@ -10,11 +10,14 @@ pkgbase = catcat-dm-react
 	makedepends = gendesk
 	makedepends = yarn
 	makedepends = git
-	makedepends = make
+	makedepends = base-devel
 	makedepends = gcc
+	depends = electron23
 	depends = hicolor-icon-theme
 	conflicts = catcat-dm-react
 	source = catcat-dm-react.git::git+https://github.com/kokolokksk/catcat-dm-react.git#tag=v1.9.6
+	source = catcat-dm-react.sh
 	sha256sums = SKIP
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = catcat-dm-react
diff --git a/PKGBUILD b/PKGBUILD
index 3299df505d2a..bb042149ffd2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,14 @@ _pkgname="CatCatDM React"
 pkgver=1.9.6
 _electronversion=23
 _nodeversion=18
-pkgrel=3
+pkgrel=4
 pkgdesc="catcat弹幕姬.哔哩哔哩直播弹幕姬： 查看直播间弹幕。"
 arch=('any')
 url="https://github.com/kokolokksk/catcat-dm-react"
 license=('MIT')
 conflicts=("${pkgname}")
 depends=(
+    "electron${_electronversion}"
     'hicolor-icon-theme'
 )
 makedepends=(
@@ -19,13 +20,15 @@ makedepends=(
     'gendesk'
     'yarn'
     'git'
-    'make'
+    'base-devel'
     'gcc'
 )
 source=(
     "${pkgname}.git::git+${url}.git#tag=v${pkgver}"
+    "${pkgname}.sh"
 )
-sha256sums=('SKIP')
+sha256sums=('SKIP'
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 _ensure_local_nvm() {
     export NVM_DIR="${srcdir}/.nvm"
     source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
@@ -33,22 +36,31 @@ _ensure_local_nvm() {
     nvm use "${_nodeversion}"
 }
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname}|g" \
+        -e "s|@runname@|app.asar|g" \
+        -i "${srcdir}/${pkgname}.sh"
     _ensure_local_nvm
-    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 npm_config_cache="${srcdir}/.npm_cache"
     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}"
-    sed "s|-p always|-p never|g" -i package.json
+    export npm_config_disturl=https://electronjs.org/headers
+    HOME="${srcdir}/.electron-gyp"
+    sed "s|-p always|-l AppImage -p never|g" -i package.json
+    sed "s|app.isPackaged|!app.isPackaged|g" -i src/main/main.ts
     npm install --force
+    npm add patch-package
     npm run package
 }
 package() {
-    install -Dm755 -d "${pkgdir}/"{opt/"${pkgname}",usr/bin}
-    cp -r  "${srcdir}/${pkgname}.git/release/build/linux-"*/* "${pkgdir}/opt/${pkgname}"
-    ln -sf "/opt/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/release/build/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
+    cp -r  "${srcdir}/${pkgname}.git/release/build/linux-"*/resources/assets "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
     for _icons in 16x16 24x24 32x32 48x48 64x64 96x96 128x128 256x256 512x512 1024x1024;do
         install -Dm644 "${srcdir}/${pkgname}.git/assets/icons/${_icons}.png" \
diff --git a/catcat-dm-react.sh b/catcat-dm-react.sh
new file mode 100644
index 000000000000..f9ced1432cfc
--- /dev/null
+++ b/catcat-dm-react.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+set -e
+_APPDIR="/usr/lib/@appname@"
+_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@ "${_RUNNAME}" "$@" || exit $?
+else
+    exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi
\ No newline at end of file