fix errors

3 files changed, 27 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 235efb809f79..886180330a55 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pomodoro-bin
 	pkgdesc = Pomodoro timer base on Electron.
 	pkgver = 1.8.2
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/AndrewMaksimchuk/pomodoro
 	arch = x86_64
 	license = MIT
@@ -9,10 +9,10 @@ pkgbase = pomodoro-bin
 	provides = pomodoro=1.8.2
 	conflicts = pomodoro
 	source = pomodoro-1.8.2.deb::https://github.com/AndrewMaksimchuk/pomodoro/releases/download/v1.8.2/pomodoro_1.8.1_amd64.deb
-	source = LICENSE::https://raw.githubusercontent.com/AndrewMaksimchuk/pomodoro/v1.8.2/LICENSE
+	source = LICENSE-1.8.2::https://raw.githubusercontent.com/AndrewMaksimchuk/pomodoro/v1.8.2/LICENSE
 	source = pomodoro.sh
 	sha256sums = 5a4cea8654d45cc371f79f7d4ccf52da86dd309b79285fd470999624968cd74a
 	sha256sums = 6c3be11c505c08a5a1a041f62fff718177de780c85e4e49609aa5ca22c2148a9
-	sha256sums = 1bb4bd6f4334245b8f277936e361abcf05231ddb18308da0d08ba801cdba0598
+	sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
 
 pkgname = pomodoro-bin
diff --git a/PKGBUILD b/PKGBUILD
index 2528c77b2244..90d147fc9363 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=pomodoro-bin
 pkgver=1.8.2
-pkgrel=3
+_electronversion=25
+pkgrel=4
 pkgdesc="Pomodoro timer base on Electron."
 arch=("x86_64")
 url="https://github.com/AndrewMaksimchuk/pomodoro"
@@ -9,19 +10,22 @@ license=("MIT")
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
-    'electron25'
+    "electron${_electronversion}"
 )
 source=(
     "${pkgname%-bin}-${pkgver}.deb::${url}/releases/download/v${pkgver}/${pkgname%-bin}_1.8.1_amd64.deb"
-    "LICENSE::https://raw.githubusercontent.com/AndrewMaksimchuk/pomodoro/v${pkgver}/LICENSE"
+    "LICENSE-${pkgver}::https://raw.githubusercontent.com/AndrewMaksimchuk/pomodoro/v${pkgver}/LICENSE"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('5a4cea8654d45cc371f79f7d4ccf52da86dd309b79285fd470999624968cd74a'
             '6c3be11c505c08a5a1a041f62fff718177de780c85e4e49609aa5ca22c2148a9'
-            '1bb4bd6f4334245b8f277936e361abcf05231ddb18308da0d08ba801cdba0598')
+            '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
 build() {
+    sed -e "s|@electronversion@|${_electronversion}|g" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
     bsdtar -xf "${srcdir}/data.tar.zst"
-    sed "s| %U||g" -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
@@ -29,5 +33,5 @@ package() {
     cp -r "${srcdir}/usr/lib/pomodoro/resources/app" "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/usr/share/pixmaps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
-    install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/LICENSE-${pkgver}" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
\ No newline at end of file
diff --git a/pomodoro.sh b/pomodoro.sh
index 73fb3f5b4b42..c77c53567639 100644
--- a/pomodoro.sh
+++ b/pomodoro.sh
@@ -1,11 +1,17 @@
-#!/bin/bash
-_ELECTRON=/usr/bin/electron25
-APPDIR="/usr/lib/pomodoro"
-export PATH="${APPDIR}:${PATH}"
-#export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app"
+#!/bin/sh
+set -e
+_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
+    exit
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+    exit
 fi
\ No newline at end of file