update to 2.0.0

3 files changed, 27 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a7798b2c6e7e..f9ef85b5ab39 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,21 @@
 pkgbase = jlivertool
 	pkgdesc = Bilibili 弹幕机
-	pkgver = 1.4.1
-	pkgrel = 2
+	pkgver = 2.0.0
+	pkgrel = 1
 	url = https://github.com/Xinrea/JLiverTool
-	arch = any
+	arch = x86_64
 	license = MIT
 	makedepends = npm
 	makedepends = nodejs
 	makedepends = gendesk
 	makedepends = git
-	depends = electron15
+	depends = electron26
+	depends = java-runtime
 	provides = jlivertool
 	conflicts = jlivertool
-	source = jlivertool-1.4.1::git+https://github.com/Xinrea/JLiverTool.git#tag=v1.4.1
+	source = jlivertool.git::git+https://github.com/Xinrea/JLiverTool.git#tag=v2.0.0
 	source = jlivertool.sh
 	sha256sums = SKIP
-	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
+	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
 
 pkgname = jlivertool
diff --git a/PKGBUILD b/PKGBUILD
index 3b9eabd48664..8494531b7505 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,18 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=jlivertool
 _pkgname=JLiverTool
-pkgver=1.4.1
-_electronversion=15
-pkgrel=2
+pkgver=2.0.0
+_electronversion=26
+pkgrel=1
 pkgdesc="Bilibili 弹幕机"
-arch=('any')
+arch=('x86_64')
 url="https://github.com/Xinrea/JLiverTool"
 license=('MIT')
 provides=("${pkgname}")
 conflicts=("${pkgname}")
 depends=(
     "electron${_electronversion}"
+    'java-runtime'
 )
 makedepends=(
     'npm'
@@ -20,31 +21,31 @@ makedepends=(
     'git'
 )
 source=(
-    "${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver}"
+    "${pkgname}.git::git+${url}.git#tag=v${pkgver}"
     "${pkgname}.sh"
 )
 sha256sums=('SKIP'
-            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
+            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname}|g" \
         -e "s|@appasar@|app.asar|g" \
         -i "${srcdir}/${pkgname}.sh"
     gendesk -q -f -n --categories "Utility" --name "${_pkgname}" --exec "${pkgname}"
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    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 ELECTRONVERSION="${_electronversion}"
-    sed "s|-mw|-l|g" -i package.json
+    sed '42,53d' -i package.json
     npm install
-    npm run build
+    npm run build-linux
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/dist/linux-unpacked/swiftshader/"* -t "${pkgdir}/usr/lib/${pkgname}/swiftshader"
+    install -Dm644 "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
+    cp -r "${srcdir}/${pkgname}.git/dist/linux-"*/resources/app.asar.unpacked "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/LICENSE.md" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/jlivertool.sh b/jlivertool.sh
index 2ec4412e5c4f..aacd8f895847 100644
--- a/jlivertool.sh
+++ b/jlivertool.sh
@@ -1,14 +1,15 @@
-#!/bin/bash
+#!/bin/sh
 set -e
 _APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
 export PATH="${_APPDIR}:${PATH}"
-export ELECTRON_IS_DEV=0
 export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${_APPDIR}/@appasar@"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
+cd "${_APPDIR}"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    cd "${_APPDIR}"
     exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    cd "${_APPDIR}"
     exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
\ No newline at end of file
+fi
+exit
\ No newline at end of file