Build with electron2 instead node-lts-carbon

3 files changed, 27 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f5208b237744..8780bf16b187 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,25 @@
 pkgbase = sqlectron-gui-git
 	pkgdesc = A simple and lightweight SQL client with cross database and platform support
 	pkgver = 1.30.0+10+g3b448ef
-	pkgrel = 1
+	pkgrel = 2
 	url = https://sqlectron.github.io/
 	arch = x86_64
 	license = MIT
 	makedepends = asar
 	makedepends = git
 	makedepends = libsass
-	makedepends = nodejs-lts-carbon
 	makedepends = npm
 	depends = electron2
 	provides = sqlectron-gui
 	conflicts = sqlectron-gui
 	source = sqlectron-gui-git::git+https://github.com/sqlectron/sqlectron-gui.git
-	source = sqlectron-gui.sh
+	source = node.sh
 	source = sqlectron-gui.desktop
+	source = sqlectron-gui.sh
 	sha1sums = SKIP
-	sha1sums = 6ad81d34e04c1760d4be27f0e4ec25ff5267deca
+	sha1sums = f756fdbfbb244886f4cd907030715f46222207de
 	sha1sums = b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f
+	sha1sums = 6ad81d34e04c1760d4be27f0e4ec25ff5267deca
 
 pkgname = sqlectron-gui-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 8fdfb76a7f29..13e7155eced8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=sqlectron-gui-git
 pkgver=1.30.0+10+g3b448ef
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple and lightweight SQL client with cross database and platform support"
 arch=('x86_64')
 url="https://sqlectron.github.io/"
@@ -12,18 +12,20 @@ makedepends=(
 	'asar'
 	'git'
 	'libsass'
-	'nodejs-lts-carbon'
 	'npm'
 )
 conflicts=('sqlectron-gui')
 provides=('sqlectron-gui')
-source=("${pkgname}::git+https://github.com/sqlectron/sqlectron-gui.git"
-        'sqlectron-gui.sh'
-		'sqlectron-gui.desktop')
-
+source=(
+	"${pkgname}::git+https://github.com/sqlectron/sqlectron-gui.git"
+	'node.sh'
+	'sqlectron-gui.desktop'
+	'sqlectron-gui.sh'
+)
 sha1sums=('SKIP'
-          '6ad81d34e04c1760d4be27f0e4ec25ff5267deca'
-          'b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f')
+          'f756fdbfbb244886f4cd907030715f46222207de'
+          'b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f'
+          '6ad81d34e04c1760d4be27f0e4ec25ff5267deca')
 
 pkgver() {
 	cd "${pkgname}"
@@ -43,19 +45,21 @@ prepare() {
 		-e '/"webpack-dev-middleware":/ d' \
 		-e '/"webpack-dev-server":/     d' \
 		-e '/"webpack-bundle-analyzer":/ s/,$//'
+
+	install -Dm0755 "$srcdir/node.sh" "$srcdir/bin/node"
 }
 
 build() {
 	cd "${pkgname}"
 
+	export PATH="$srcdir/bin:$PATH"
 	export SASS_FORCE_BUILD=1
 	export LIBSASS_EXT=auto
 	export npm_config_optional=false
+	export npm_config_nodedir=/usr/lib/electron2/node
+	export npm_config_scripts_prepend_node_path=false
 
-
-	npm install \
-		--build-from-source \
-		--nodedir=/usr
+	npm install --build-from-source
 
 	npm run compile:browser
 	npm run compile:renderer
@@ -68,7 +72,6 @@ build() {
 	npm install \
 		--production \
 		--build-from-source \
-		--nodedir=/usr/lib/electron2/node \
 		--runtime=electron \
 		--target=$(</usr/lib/electron2/version)
 
diff --git a/node.sh b/node.sh
new file mode 100644
index 000000000000..84bccb086e7b
--- /dev/null
+++ b/node.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+export ELECTRON_RUN_AS_NODE=1
+export ELECTRON_NO_ASAR=1
+
+exec /usr/lib/electron2/electron2 "$@"