fix errors

3 files changed, 47 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 14410a197852..bfe04f60611c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 pkgbase = elements-latex
 	pkgdesc = A cross-platform, powerful electron-based LaTeX editor
 	pkgver = 0.0.3_stable
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Red-Rapious/Elements-LaTeX
 	arch = any
-	license = CC-BY-NC-SA-4.0
+	license = custom:CC-BY-NC-SA-4.0
 	makedepends = gendesk
 	makedepends = npm
-	depends = bash
+	makedepends = nodejs
+	makedepends = git
 	depends = electron18
 	conflicts = elements-latex
-	source = elements-latex-0.0.3_stable.tar.gz::https://github.com/Red-Rapious/Elements-LaTeX/archive/refs/tags/v0.0.3-stable.tar.gz
+	source = elements-latex-0.0.3_stable::git+https://github.com/Red-Rapious/Elements-LaTeX.git#tag=v0.0.3-stable
 	source = elements-latex.sh
-	sha256sums = 447fa0de8dba9cca3f116ba6aa7ac35600dba5ab57cf3e8c18eebbba971a9151
-	sha256sums = 4afc2774225d164de54bad329e42588ef2766538f84910a3961af07562f068f2
+	sha256sums = SKIP
+	sha256sums = 4af015cab61ba72cda4118a9a842cd941a850a7d197e6a1da2a8e77eafcc4455
 
 pkgname = elements-latex
diff --git a/PKGBUILD b/PKGBUILD
index 5074964877b2..961bf7f2e500 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,30 +2,44 @@
 pkgname=elements-latex
 _pkgname=Elements-LaTeX
 pkgver=0.0.3_stable
-pkgrel=2
+_electronversion=18
+pkgrel=3
 pkgdesc="A cross-platform, powerful electron-based LaTeX editor"
 arch=('any')
 url="https://github.com/Red-Rapious/Elements-LaTeX"
-license=('CC-BY-NC-SA-4.0')
+license=('custom:CC-BY-NC-SA-4.0')
 conflicts=("${pkgname}")
-depends=('bash' 'electron18')
-makedepends=('gendesk' 'npm')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver//_/-}.tar.gz"
-    "${pkgname}.sh")
-sha256sums=('447fa0de8dba9cca3f116ba6aa7ac35600dba5ab57cf3e8c18eebbba971a9151'
-            '4afc2774225d164de54bad329e42588ef2766538f84910a3961af07562f068f2')
-prepare() {
-    gendesk -f -n -q --categories "Utility" --name "${_pkgname}" --exec "${pkgname}"
-}
+depends=(
+    "electron${_electronversion}"
+)
+makedepends=(
+    'gendesk'
+    'npm'
+    'nodejs'
+    'git'
+)
+source=(
+    "${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver//_/-}"
+    "${pkgname}.sh"
+)
+sha256sums=('SKIP'
+            '4af015cab61ba72cda4118a9a842cd941a850a7d197e6a1da2a8e77eafcc4455')
 build() {
-    cd "${srcdir}/${_pkgname}-${pkgver//_/-}"
+    sed -e "s|@electronversion@|${_electronversion}|" \
+        -e "s|@appname@|${pkgname}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname}.sh"
+    gendesk -f -n -q --categories "Utility" --name "${_pkgname}" --exec "${pkgname}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    export npm_config_build_from_source=true
+    export npm_config_cache="${srcdir}/.npm_cache"
     npm install
     npm run build
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${_pkgname}-${pkgver//_/-}/build/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
-    install -Dm644 "${srcdir}/${_pkgname}-${pkgver//_/-}/assets/logos/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/build/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/assets/logos/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/${_pkgname}-${pkgver//_/-}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/elements-latex.sh b/elements-latex.sh
index 61ecebdd1a91..3342cf0aad09 100644
--- a/elements-latex.sh
+++ b/elements-latex.sh
@@ -1,8 +1,15 @@
+
 #!/bin/bash
-_ELECTRON=/usr/bin/electron18
-_ASAR="/opt/elements-latex/resources/app.asar"
+set -e
+_APPDIR="/usr/lib/@appname@"
+export PATH="${_APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+_ASAR="${_APPDIR}/@appasar@"
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
 fi
\ No newline at end of file