fix errors

3 files changed, 26 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6bc593bc316..622d53d762a0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,18 @@
 pkgbase = masscode-bin
 	pkgdesc = A free and open source code snippets manager for developers
 	pkgver = 3.10.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://masscode.io/
 	arch = x86_64
 	license = AGPL3
 	makedepends = gendesk
 	makedepends = squashfs-tools
-	depends = bash
 	depends = electron16
 	provides = masscode=3.10.0
 	conflicts = masscode
 	source = masscode-3.10.0.snap::https://github.com/massCodeIO/massCode/releases/download/v3.10.0/masscode_3.10.0_amd64.snap
 	source = masscode.sh
 	sha256sums = d4e9aebeabac38aba5180a89083c25ea2e53028ce39a44d57a058d8d76232d6d
-	sha256sums = d87bbdc2b2585aa2a572ed38898c94ae127e7ff6beab0aee26cd0624eea55bd6
+	sha256sums = c5e1e4400e87a6705b17363a7fc766be3abb898a374b643ded1724557ec221ca
 
 pkgname = masscode-bin
diff --git a/PKGBUILD b/PKGBUILD
index 4387cd74682f..62f6a52100b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,36 @@
 pkgname=masscode-bin
 _pkgname=massCode
 pkgver=3.10.0
-pkgrel=1
+_electronversion=16
+pkgrel=2
 pkgdesc="A free and open source code snippets manager for developers"
 arch=('x86_64')
 url="https://masscode.io/"
-_githuburl="https://github.com/massCodeIO/massCode"
+_ghurl="https://github.com/massCodeIO/massCode"
 license=('AGPL3')
 provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
-depends=('bash' 'electron16')
-makedepends=('gendesk' 'squashfs-tools')
-source=("${pkgname%-bin}-${pkgver}.snap::${_githuburl}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.snap"
+depends=(
+    "electron${_electronversion}"
+)
+makedepends=(
+    'gendesk'
+    'squashfs-tools'
+)
+source=(
+    "${pkgname%-bin}-${pkgver}.snap::${_ghurl}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.snap"
     "${pkgname%-bin}.sh"
 )
 sha256sums=('d4e9aebeabac38aba5180a89083c25ea2e53028ce39a44d57a058d8d76232d6d'
-            'd87bbdc2b2585aa2a572ed38898c94ae127e7ff6beab0aee26cd0624eea55bd6')
+            'c5e1e4400e87a6705b17363a7fc766be3abb898a374b643ded1724557ec221ca')
 build() {
+    sed -i "s|@electronversion@|${_electronversion}|" "$srcdir/${pkgname%-bin}.sh"
     unsquashfs "${srcdir}/${pkgname%-bin}-${pkgver}.snap"
     gendesk -q -f -n --categories "Development;Utility" --name "${_pkgname}" --exec "${pkgname%-bin}"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/opt/${pkgname%-bin}/resources"
+    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
     install -Dm644 "${srcdir}/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/squashfs-root/meta/gui/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname%-bin}.png"
 }
\ No newline at end of file
diff --git a/masscode.sh b/masscode.sh
index 1457e36cd80c..13fc2c4b641c 100644
--- a/masscode.sh
+++ b/masscode.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron16
-_ASAR="/opt/masscode/resources/app.asar"
+APPDIR="/usr/lib/masscode"
+export PATH="${APPDIR}:${PATH}"
+export ELECTRON_IS_DEV=0
+#export LD_LIBRARY_PATH="${APPDIR}/swiftshader:${LD_LIBRARY_PATH}"
+_ASAR="${APPDIR}/app.asar"
 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