fix errors

3 files changed, 22 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c220e23aaa7e..8c3656f03793 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = elements-latex
 	pkgdesc = A cross-platform, powerful electron-based LaTeX editor
 	pkgver = 0.0.3_stable
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/Red-Rapious/Elements-LaTeX
 	arch = any
 	license = custom:CC-BY-NC-SA-4.0
@@ -11,9 +11,9 @@ pkgbase = elements-latex
 	makedepends = git
 	depends = electron18
 	conflicts = elements-latex
-	source = elements-latex-0.0.3_stable::git+https://github.com/Red-Rapious/Elements-LaTeX.git#tag=v0.0.3-stable
+	source = elements-latex.git::git+https://github.com/Red-Rapious/Elements-LaTeX.git#tag=v0.0.3-stable
 	source = elements-latex.sh
 	sha256sums = SKIP
-	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
+	sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
 
 pkgname = elements-latex
diff --git a/PKGBUILD b/PKGBUILD
index 850e9f47e361..bb1b60721268 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@ pkgname=elements-latex
 _pkgname=Elements-LaTeX
 pkgver=0.0.3_stable
 _electronversion=18
-pkgrel=3
+pkgrel=4
 pkgdesc="A cross-platform, powerful electron-based LaTeX editor"
 arch=('any')
 url="https://github.com/Red-Rapious/Elements-LaTeX"
@@ -19,27 +19,30 @@ 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 -f -n -q --categories "Utility" --name "${_pkgname}" --exec "${pkgname}"
-    cd "${srcdir}/${pkgname}-${pkgver}"
+    gendesk -f -n -q --categories "Utility" --name "${_pkgname}" --exec "${pkgname} %U"
+    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}"
     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}/usr/lib/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/assets/logos/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm644 "${srcdir}/${pkgname}.git/build/linux-"*/resources/app.asar -t "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}.git/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}.git/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+}
\ No newline at end of file
diff --git a/elements-latex.sh b/elements-latex.sh
index 2ec4412e5c4f..aacd8f895847 100644
--- a/elements-latex.sh
+++ b/elements-latex.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