summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorzxp198210052024-02-26 17:21:37 +0800
committerzxp198210052024-02-26 17:21:37 +0800
commit0e86ba5b71e23f2f0695a2e9dfb95a25f4d4377a (patch)
tree3289c18e81b328ebbc0ec694a7d6a1fb1fc02f74
parent3b0cf16493cfbff31d5c15845fd10a4758dcf701 (diff)
downloadaur-0e86ba5b71e23f2f0695a2e9dfb95a25f4d4377a.tar.gz
fix errors
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD21
-rw-r--r--electron-deno-ide.sh9
3 files changed, 21 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index baeabbfc2c67..0a624cf6a2d9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
pkgbase = electron-deno-ide
pkgdesc = Deno IDE supported all of programming language
pkgver = 0.1.1_beta
- pkgrel = 4
+ pkgrel = 5
url = https://github.com/MooudMohammady/electron-deno-IDE
- arch = x86_64
- license = GPL3
+ arch = any
+ license = GPL-3.0-only
makedepends = gendesk
makedepends = npm
makedepends = nodejs
makedepends = git
- makedepends = make
+ makedepends = base-devel
makedepends = gcc
depends = electron25
conflicts = electron-deno-ide
source = electron-deno-ide.git::git+https://github.com/MooudMohammady/electron-deno-IDE.git#tag=v0.1.1-beta
source = electron-deno-ide.sh
sha256sums = SKIP
- sha256sums = d4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231
+ sha256sums = 0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014
pkgname = electron-deno-ide
diff --git a/PKGBUILD b/PKGBUILD
index be8fcb829201..4c9cabe327f7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,11 +3,11 @@ pkgname=electron-deno-ide
_pkgname=electron-deno-IDE
pkgver=0.1.1_beta
_electronversion=25
-pkgrel=4
+pkgrel=5
pkgdesc="Deno IDE supported all of programming language"
-arch=('x86_64')
+arch=('any')
url="https://github.com/MooudMohammady/electron-deno-IDE"
-license=('GPL3')
+license=('GPL-3.0-only')
conflicts=("${pkgname}")
depends=(
"electron${_electronversion}"
@@ -17,7 +17,7 @@ makedepends=(
'npm'
'nodejs'
'git'
- 'make'
+ 'base-devel'
'gcc'
)
source=(
@@ -25,23 +25,26 @@ source=(
"${pkgname%-bin}.sh"
)
sha256sums=('SKIP'
- 'd4272fed78cdcacd9edfb019134ac485d65b43f4d8c7a4179edbaed56af9b231')
+ '0fb7b939a071f4a08476bdd5aa143d2aa8cd335c83309f9919be16cd5c3e2014')
build() {
sed -e "s|@electronversion@|${_electronversion}|" \
-e "s|@appname@|${pkgname}|g" \
- -e "s|@appasar@|app.asar|g" \
+ -e "s|@runname@|app.asar|g" \
-i "${srcdir}/${pkgname}.sh"
- gendesk -f -n -q --categories "Development" --name "${_pkgname}" --exec "${pkgname} %U"
+ gendesk -f -n -q --categories="Development" --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 npm_config_target="${SYSTEM_ELECTRON_VERSION}"
export ELECTRONVERSION="${_electronversion}"
+ export npm_config_disturl=https://electronjs.org/headers
+ HOME="${srcdir}/.electron-gyp"
sed '/"electron-rebuild":/d' -i package.json
- sed 's|win|linux|g;s|"nsis",|"AppImage",|g;s|"release/${version}"|"release"|g' -i electron-builder.json5
+ sed 's|"release/${version}"|"release"|g' -i electron-builder.json5
npm install --force
- npx electron-builder
+ npx electron-builder -l AppImage
}
package() {
install -Dm755 "${srcdir}/${pkgname}.sh" "${pkgdir}/usr/bin/${pkgname}"
diff --git a/electron-deno-ide.sh b/electron-deno-ide.sh
index aacd8f895847..f9ced1432cfc 100644
--- a/electron-deno-ide.sh
+++ b/electron-deno-ide.sh
@@ -1,15 +1,14 @@
#!/bin/sh
set -e
_APPDIR="/usr/lib/@appname@"
-_ASAR="${_APPDIR}/@appasar@"
+_RUNNAME="${_APPDIR}/@runname@"
export PATH="${_APPDIR}:${PATH}"
export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
export ELECTRON_IS_DEV=0
export NODE_ENV=production
cd "${_APPDIR}"
if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
- exec electron@electronversion@ "${_ASAR}" "$@"
+ exec electron@electronversion@ "${_RUNNAME}" "$@" || exit $?
else
- exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
-fi
-exit \ No newline at end of file
+ exec electron@electronversion@ "${_RUNNAME}" --no-sandbox "$@" || exit $?
+fi \ No newline at end of file