fix errors

3 files changed, 42 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 179e85dcc695..4af36626c6e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
 pkgbase = loopy-desktop
 	pkgdesc = A tool for thinking in systems
 	pkgver = 1.2.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/jchu634/loopy-desktop
 	arch = any
 	license = MIT
 	makedepends = gendesk
 	makedepends = yarn
 	makedepends = npm
-	depends = bash
+	makedepends = nodejs
+	makedepends = git
 	depends = electron21
-	depends = hicolor-icon-theme
 	conflicts = loopy-desktop
-	source = loopy-desktop-1.2.1.tar.gz::https://github.com/jchu634/loopy-desktop/archive/refs/tags/v1.2.1.tar.gz
+	source = loopy-desktop-1.2.1::git+https://github.com/jchu634/loopy-desktop.git#tag=v1.2.1
 	source = loopy-desktop.sh
-	sha256sums = 964320fde15be102235feac8e2e1bab115e8fcfe8245645d5411dac114446f27
-	sha256sums = 2d6f5f8f18426ce969673d3ab6422da092044974294d9e347284a11adf2be6db
+	sha256sums = SKIP
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = loopy-desktop
diff --git a/PKGBUILD b/PKGBUILD
index 814a24b43845..8e5093cd58c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,29 +1,43 @@
 # Maintainer: zxp19821005 <zxp19821005 at 163 dot com>
 pkgname=loopy-desktop
 pkgver=1.2.1
-pkgrel=2
+_electronversion=21
+pkgrel=3
 pkgdesc="A tool for thinking in systems"
 arch=('any')
 url="https://github.com/jchu634/loopy-desktop"
 license=('MIT')
 conflicts=("${pkgname}")
-depends=('bash' 'electron21' 'hicolor-icon-theme')
-makedepends=('gendesk' 'yarn' 'npm')
-source=("${pkgname}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
-    "${pkgname}.sh")
-sha256sums=('964320fde15be102235feac8e2e1bab115e8fcfe8245645d5411dac114446f27'
-            '2d6f5f8f18426ce969673d3ab6422da092044974294d9e347284a11adf2be6db')
-prepare() {
-    gendesk -f -n -q --categories "Utility" --name "${pkgname}" --exec "${pkgname}"
-}
+depends=(
+    "electron${_electronversion}"
+)
+makedepends=(
+    'gendesk'
+    'yarn'
+    'npm'
+    'nodejs'
+    'git'
+)
+source=(
+    "${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver}"
+    "${pkgname}.sh"
+)
+sha256sums=('SKIP'
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 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}"
-    1yarn install
+    yarn config set cache-folder "${srcdir}/.yarn_cache"
+    yarn install
     yarn dist
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/release/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/release/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/resources/_icons/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
     install -Dm644 "${srcdir}/${pkgname}-${pkgver}/LICENSE.txt" -t "${pkgdir}/usr/share/licenses/${pkgname}"
diff --git a/loopy-desktop.sh b/loopy-desktop.sh
index 31f77e92b9c6..2ec4412e5c4f 100644
--- a/loopy-desktop.sh
+++ b/loopy-desktop.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron21
-_ASAR="/opt/loopy-desktop/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