summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsurefire2019-02-01 10:35:22 +0300
committersurefire2019-02-01 10:36:34 +0300
commitd965df55fa8ad8c13d6cd1a38154ad315d6336de (patch)
treeeade2f7f271f22efa399370536903573fb090933
parent6daa10540917fef0295e03ddbe41df1abd758d68 (diff)
downloadaur-d965df55fa8ad8c13d6cd1a38154ad315d6336de.tar.gz
Build with electron2 instead node-lts-carbon
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD22
-rw-r--r--node.sh6
3 files changed, 22 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3019cb10a361..9bd03bdfb527 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
pkgbase = sqlectron-gui
pkgdesc = A simple and lightweight SQL client with cross database and platform support
pkgver = 1.30.0
- pkgrel = 1
+ pkgrel = 2
url = https://sqlectron.github.io/
arch = x86_64
license = MIT
makedepends = asar
makedepends = libsass
- makedepends = nodejs-lts-carbon
makedepends = npm
depends = electron2
source = https://github.com/sqlectron/sqlectron-gui/archive/v1.30.0.tar.gz
source = sqlectron-gui.sh
source = sqlectron-gui.desktop
+ source = node.sh
sha1sums = 467869f0678cc0e99ca268c9c3d1aafc565c130f
sha1sums = 6ad81d34e04c1760d4be27f0e4ec25ff5267deca
sha1sums = b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f
+ sha1sums = cc8eab72cdc552f58b948bd45f8554a9a7fc8a7c
pkgname = sqlectron-gui
diff --git a/PKGBUILD b/PKGBUILD
index 341ce251d96f..4cc8b79eb30a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=sqlectron-gui
pkgver=1.30.0
-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,16 +12,18 @@ depends=('electron2')
makedepends=(
'asar'
'libsass'
- 'nodejs-lts-carbon'
'npm'
)
source=("https://github.com/sqlectron/sqlectron-gui/archive/v${pkgver}.tar.gz"
'sqlectron-gui.sh'
- 'sqlectron-gui.desktop')
+ 'sqlectron-gui.desktop'
+ 'node.sh'
+)
sha1sums=('467869f0678cc0e99ca268c9c3d1aafc565c130f'
'6ad81d34e04c1760d4be27f0e4ec25ff5267deca'
- 'b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f')
+ 'b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f'
+ 'cc8eab72cdc552f58b948bd45f8554a9a7fc8a7c')
prepare() {
cd "$pkgname-$pkgver"
@@ -36,18 +38,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-$pkgver"
+ 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
@@ -60,11 +65,10 @@ build() {
npm install \
--production \
--build-from-source \
- --nodedir=/usr/lib/electron2/node \
--runtime=electron \
--target=$(</usr/lib/electron2/version)
-
popd
+
asar p app app.asar
}
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 "$@"