fix errors

3 files changed, 46 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b26df459d5c1..ab2abd4f647f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,22 @@
 pkgbase = bear-graph
 	pkgdesc = Graph view of notes from Bear.app
 	pkgver = 1.0.0
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/Chuckleroot/bear-graph
 	arch = x86_64
 	license = MIT
 	makedepends = gendesk
 	makedepends = npm
-	depends = bash
+	makedepends = nodejs
+	makedepends = git
+	makedepends = node-gyp
+	makedepends = make
+	makedepends = gcc
 	depends = electron25
 	conflicts = bear-graph
-	source = bear-graph-1.0.0.tar.gz::https://github.com/Chuckleroot/bear-graph/archive/refs/tags/v1.0.0.tar.gz
+	source = bear-graph-1.0.0::git+https://github.com/Chuckleroot/bear-graph.git#tag=v1.0.0
 	source = bear-graph.sh
-	sha256sums = cae1864427aaa86cc378cb7700c1a5a1643bda4575a34aef5ceff096e6cff2be
-	sha256sums = 3c36eb57194e278f61fcc5e589f45f46b8debfde996cad43d676302621f7c6c5
+	sha256sums = SKIP
+	sha256sums = c30a35bf791782272b394741ec9272a4cfdb3fb7669effaee86a7f65a294be91
 
 pkgname = bear-graph
diff --git a/PKGBUILD b/PKGBUILD
index d923a9881107..3a86529521b5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,29 +2,46 @@
 pkgname=bear-graph
 _pkgname="Bear Graph"
 pkgver=1.0.0
-pkgrel=2
+_electronversion=25
+pkgrel=3
 pkgdesc="Graph view of notes from Bear.app"
 arch=('x86_64')
 url="https://github.com/Chuckleroot/bear-graph"
 license=('MIT')
 conflicts=("${pkgname}")
-depends=('bash' 'electron25')
-makedepends=('gendesk' 'npm')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
-    "${pkgname}.sh")
-sha256sums=('cae1864427aaa86cc378cb7700c1a5a1643bda4575a34aef5ceff096e6cff2be'
-            '3c36eb57194e278f61fcc5e589f45f46b8debfde996cad43d676302621f7c6c5')
-prepare() {
-    gendesk -f -n -q --categories "Utility" --name "${_pkgname}" --exec "${pkgname}"
-}
+depends=(
+    "electron${_electronversion}"
+)
+makedepends=(
+    'gendesk'
+    'npm'
+    'nodejs'
+    'git'
+    'node-gyp'
+    'make'
+    'gcc'
+)
+source=(
+    "${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver}"
+    "${pkgname}.sh"
+)
+sha256sums=('SKIP'
+            'c30a35bf791782272b394741ec9272a4cfdb3fb7669effaee86a7f65a294be91')
 build() {
+    sed -i "s|@electronversion@|${_electronversion}|" "$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"
+    export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+    export SYSTEM_ELECTRON_VERSION="$(electron${_electronversion} -v | sed 's/v//g')"
+    export ELECTRONVERSION="${_electronversion}"
     npm install
     npm run package
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/out/${_pkgname}-linux-x64/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/out/${_pkgname}-linux-x64/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
\ No newline at end of file
diff --git a/bear-graph.sh b/bear-graph.sh
index 2d95226cf76e..248c78869cd5 100644
--- a/bear-graph.sh
+++ b/bear-graph.sh
@@ -1,8 +1,13 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron25
-_ASAR="/opt/bear-graph/resources/app.asar"
+APPDIR="/usr/lib/bear-graph"
+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