fix errors

3 files changed, 17 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 85c9d64768c7..c33ea750af57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,18 @@
 pkgbase = boats-animator-bin
 	pkgdesc = Stop motion animation program created using Electron
 	pkgver = 0.13.0
-	pkgrel = 1
+	pkgrel = 2
 	url = http://charlielee.uk/boats-animator
 	arch = x86_64
 	license = GPL3
-	depends = electron
+	depends = bash
+	depends = electron22
 	depends = hicolor-icon-theme
+	provides = boats-animator
 	conflicts = boats-animator
-	conflicts = boats-animator-appimage
 	source = boats-animator-0.13.0.deb::https://github.com/charlielee/boats-animator/releases/download/v0.13.0/boats-animator-0.13.0-linux.deb
 	source = boats-animator.sh
 	sha256sums = 671e5743d742b154a6576257b58a92c013c9bed690d1787c73b433c89f9dbbab
-	sha256sums = e51b8ebcd9d7949c95ff194b57645b56a57bb17207f55a8b65f70a6a44f020c6
+	sha256sums = 72ff3e1e04a959e459881bd03b1af745e018969e8b964c23841123c269594db2
 
 pkgname = boats-animator-bin
diff --git a/PKGBUILD b/PKGBUILD
index 4992bbac77fc..051ae5cfed39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,26 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=boats-animator-bin
+_appname="Boats Animator"
 pkgver=0.13.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Stop motion animation program created using Electron"
 arch=('x86_64')
 url="http://charlielee.uk/boats-animator"
 _githuburl="https://github.com/charlielee/boats-animator"
 license=('GPL3')
-conflicts=("${pkgname%-bin}" "${pkgname%-bin}-appimage")
-depends=('electron' 'hicolor-icon-theme')
+provides=("${pkgname%-bin}")
+conflicts=("${pkgname%-bin}")
+depends=('bash' 'electron22' 'hicolor-icon-theme')
 source=("${pkgname%-bin}-${pkgver}.deb::${_githuburl}/releases/download/v${pkgver}/${pkgname%-bin}-${pkgver}-linux.deb"
     "${pkgname%-bin}.sh")
 sha256sums=('671e5743d742b154a6576257b58a92c013c9bed690d1787c73b433c89f9dbbab'
-            'e51b8ebcd9d7949c95ff194b57645b56a57bb17207f55a8b65f70a6a44f020c6')
+            '72ff3e1e04a959e459881bd03b1af745e018969e8b964c23841123c269594db2')
 package() {
     bsdtar -xf "${srcdir}/data.tar.xz"
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/opt/${pkgname%-bin}/${pkgname%-bin}"
-    cp -r "${srcdir}/opt/Boats Animator/resources/"* "${pkgdir}/opt/${pkgname%-bin}"
+    cp -r "${srcdir}/opt/${_appname}/resources/"* "${pkgdir}/opt/${pkgname%-bin}"
     rm -rf "${pkgdir}/opt/${pkgname%-bin}/package-type"
-    sed "s|\"/opt/Boats Animator/${pkgname%-bin}\" %U|/opt/${pkgname%-bin}/${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
+    sed "s|\"/opt/${_appname}/${pkgname%-bin}\" %U|/opt/${pkgname%-bin}/${pkgname%-bin}|g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     cp -r "${srcdir}/usr/share/icons" "${pkgdir}/usr/share"
 }
\ No newline at end of file
diff --git a/boats-animator.sh b/boats-animator.sh
index 255416a9fc84..4e7bede5245c 100644
--- a/boats-animator.sh
+++ b/boats-animator.sh
@@ -1,6 +1,8 @@
 #!/bin/bash
+_ELECTRON=/usr/bin/electron22
+_ASAR="/opt/boats-animator/app.asar"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec electron /opt/boats-animator/app.asar "$@"
+    exec ${_ELECTRON} ${_ASAR} "$@"
 else
-    exec electron --no-sandbox /opt/boats-animator/app.asar "$@"
+    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
 fi
\ No newline at end of file