From aed9d1e97e8312b299d8ff0ea653dc0b83869cd6 Mon Sep 17 00:00:00 2001
From: zxp19821005
Date: Wed, 28 Feb 2024 11:35:38 +0800
Subject: fix errors

---
 .SRCINFO          |  6 +++---
 PKGBUILD          | 10 +++++-----
 thorium-reader.sh |  9 ++++-----
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index ba21831..69c7d64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,10 @@
 pkgbase = thorium-reader-bin
 	pkgdesc = Cross-platform desktop reading app based on the Readium Desktop toolkit
 	pkgver = 2.3.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.edrlab.org/software/thorium-reader/
 	arch = x86_64
-	license = LicenseRef-BSD
+	license = BSD-3-Clause
 	depends = electron25
 	depends = hicolor-icon-theme
 	provides = thorium-reader=2.3.0
@@ -14,6 +14,6 @@ pkgbase = thorium-reader-bin
 	source = thorium-reader.sh
 	sha256sums = 1007cd9083715d32427e4d39f8a4cac69cf428cfc4521950571dc2290a308f23
 	sha256sums = e95e504f42685015445b4a0a80dfdaa86e5b2b2c0e317bca2bcbb51330ec61e5
-	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+	sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
 
 pkgname = thorium-reader-bin
diff --git a/PKGBUILD b/PKGBUILD
index 416e9c6..a73c9ab 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,12 +5,12 @@ _appname=Thorium
 _fullname="${_appname}Reader"
 pkgver=2.3.0
 _electronversion=25
-pkgrel=3
+pkgrel=4
 pkgdesc="Cross-platform desktop reading app based on the Readium Desktop toolkit"
 arch=('x86_64')
 url="https://www.edrlab.org/software/thorium-reader/"
 _ghurl="https://github.com/edrlab/thorium-reader"
-license=('LicenseRef-BSD')
+license=('BSD-3-Clause')
 conflicts=("${pkgname%-bin}")
 provides=("${pkgname%-bin}=${pkgver}")
 depends=(
@@ -24,13 +24,13 @@ source=(
 )
 sha256sums=('1007cd9083715d32427e4d39f8a4cac69cf428cfc4521950571dc2290a308f23'
             'e95e504f42685015445b4a0a80dfdaa86e5b2b2c0e317bca2bcbb51330ec61e5'
-            'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+            '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
 build() {
     sed -e "s|@electronversion@|${_electronversion}|" \
         -e "s|@appname@|${pkgname%-bin}|g" \
-        -e "s|@appasar@|app.asar|g" \
+        -e "s|@runname@|app.asar|g" \
         -i "${srcdir}/${pkgname%-bin}.sh"
-    bsdtar -xf "${srcdir}/data.tar.xz"
+    bsdtar -xf "${srcdir}/data."*
     sed -e "s|Name=${_appname}|Name=${_fullname}|g" \
         -e "s|/opt/${_appname}/${_pkgname}|${pkgname%-bin}|g" \
         -e "s|Icon=${_pkgname}|Icon=${pkgname%-bin}|g" \
diff --git a/thorium-reader.sh b/thorium-reader.sh
index aacd8f8..f9ced14 100644
--- a/thorium-reader.sh
+++ b/thorium-reader.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
-- 
cgit v1.2.3-70-g09d2