fix errors

3 files changed, 43 insertions, 22 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8c4a678e22dc..ade02a7b277f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,19 @@
 pkgbase = electron-deno-ide
 	pkgdesc = Deno IDE supported all of programming language
 	pkgver = 0.1.1_beta
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/MooudMohammady/electron-deno-IDE
 	arch = x86_64
 	license = GPL3
 	makedepends = gendesk
 	makedepends = npm
-	depends = bash
+	makedepends = nodejs
+	makedepends = git
 	depends = electron25
 	conflicts = electron-deno-ide
-	source = electron-deno-ide-0.1.1_beta.zip::https://github.com/MooudMohammady/electron-deno-IDE/archive/refs/tags/v0.1.1-beta.zip
+	source = electron-deno-ide-0.1.1_beta::git+https://github.com/MooudMohammady/electron-deno-IDE.git#tag=v0.1.1-beta
 	source = electron-deno-ide.sh
-	sha256sums = 90b16d69f1b3dd2b5b2610ccd3976a391c6c1d1c1e5991e132177739caedbdcd
-	sha256sums = fe810b4a8d4b2e6187eeb1529ccb89430bec85ee7e1791662c2361161aaf6b43
+	sha256sums = SKIP
+	sha256sums = 8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84
 
 pkgname = electron-deno-ide
diff --git a/PKGBUILD b/PKGBUILD
index 0d450e9b8c73..932def17eb28 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,23 +2,37 @@
 pkgname=electron-deno-ide
 _pkgname=electron-deno-IDE
 pkgver=0.1.1_beta
-pkgrel=2
+_electronversion=25
+pkgrel=3
 pkgdesc="Deno IDE supported all of programming language"
 arch=('x86_64')
 url="https://github.com/MooudMohammady/electron-deno-IDE"
 license=('GPL3')
 conflicts=("${pkgname}")
-depends=('bash' 'electron25')
-makedepends=('gendesk' 'npm')
-source=("${pkgname}-${pkgver}.zip::${url}/archive/refs/tags/v${pkgver//_/-}.zip"
-    "${pkgname%-bin}.sh")
-sha256sums=('90b16d69f1b3dd2b5b2610ccd3976a391c6c1d1c1e5991e132177739caedbdcd'
-            'fe810b4a8d4b2e6187eeb1529ccb89430bec85ee7e1791662c2361161aaf6b43')
-prepare() {
-    gendesk -f -n -q --categories "Development" --name "${_pkgname}" --exec "${pkgname}"
-}
+depends=(
+    "electron${_electronversion}"
+)
+makedepends=(
+    'gendesk'
+    'npm'
+    'nodejs'
+    'git'
+)
+source=(
+    "${pkgname}-${pkgver}::git+${url}.git#tag=v${pkgver//_/-}"
+    "${pkgname%-bin}.sh"
+)
+sha256sums=('SKIP'
+            '8915ca75d453698df81f7f3305cce6869f4261d754d90f0c3724b73c7b24ca84')
 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 "Development" --name "${_pkgname}" --exec "${pkgname}"
+    cd "${srcdir}/${pkgname}-${pkgver}"
+    export npm_config_build_from_source=true
+    export npm_config_cache="${srcdir}/.npm_cache"
     sed '/"electron-rebuild":/d' -i package.json
     sed 's|win|linux|g;s|"nsis",|"AppImage",|g' -i electron-builder.json5
     npm install
@@ -26,7 +40,7 @@ build() {
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
-    install -Dm644 "${srcdir}/${_pkgname}-${pkgver//_/-}/release/0.0.1/linux-unpacked/resources/app.asar" -t "${pkgdir}/opt/${pkgname}/resources"
-    install -Dm644 "${srcdir}/${_pkgname}-${pkgver//_/-}/build/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/release/0.0.1/linux-unpacked/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname}"
+    install -Dm644 "${srcdir}/${pkgname}-${pkgver}/build/icon.png" "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
     install -Dm644 "${srcdir}/${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
 }
\ No newline at end of file
diff --git a/electron-deno-ide.sh b/electron-deno-ide.sh
index f3585a4a8cda..2ec4412e5c4f 100644
--- a/electron-deno-ide.sh
+++ b/electron-deno-ide.sh
@@ -1,8 +1,14 @@
 #!/bin/bash
-_ELECTRON=/usr/bin/electron25
-_ASAR="/opt/electron-deno-ide/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