summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorsurefire2020-10-15 14:45:05 +0300
committersurefire2020-10-15 14:45:05 +0300
commit03ee545287a15e0330f161d824ea28981a9f7239 (patch)
tree002d7653751a3c4bbdea82e09a5cf6861949abba
parentcf434c8bd570d0aaf0714de1b136c772ef9948e3 (diff)
downloadaur-03ee545287a15e0330f161d824ea28981a9f7239.tar.gz
Update electron
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD26
-rw-r--r--sqlectron-gui.sh3
3 files changed, 16 insertions, 19 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6042d1ab7523..eb62c5f1c5c6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = sqlectron-gui
pkgdesc = A simple and lightweight SQL client with cross database and platform support
pkgver = 1.32.0
- pkgrel = 1
+ pkgrel = 2
url = https://sqlectron.github.io/
arch = x86_64
license = MIT
@@ -10,12 +10,10 @@ pkgbase = sqlectron-gui
makedepends = nodejs
makedepends = npm
makedepends = python2
- depends = electron5
+ depends = electron6
source = https://github.com/sqlectron/sqlectron-gui/archive/v1.32.0.tar.gz
- source = sqlectron-gui.sh
source = sqlectron-gui.desktop
sha1sums = f8a7c8a8367518d9acb25277a7734e7ea8e61fe8
- sha1sums = 24ea99fbf25d936d05d197638cfad2e1dc6a6d93
sha1sums = b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f
pkgname = sqlectron-gui
diff --git a/PKGBUILD b/PKGBUILD
index 2dc6af8b97bd..4b79be27dfc2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,13 +2,14 @@
# Contributor: Edison IbaƱez <edison@opmbx.org>
pkgname=sqlectron-gui
+_electron=electron6
pkgver=1.32.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/"
license=('MIT')
-depends=('electron5')
+depends=($_electron)
makedepends=(
'asar'
'libsass'
@@ -18,12 +19,10 @@ makedepends=(
)
source=(
"https://github.com/sqlectron/sqlectron-gui/archive/v${pkgver}.tar.gz"
- 'sqlectron-gui.sh'
'sqlectron-gui.desktop'
)
sha1sums=('f8a7c8a8367518d9acb25277a7734e7ea8e61fe8'
- '24ea99fbf25d936d05d197638cfad2e1dc6a6d93'
'b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f')
prepare() {
@@ -65,23 +64,26 @@ build() {
export npm_config_arch=x64
export npm_config_target_arch=x64
export npm_config_runtime=electron
- export npm_config_target=$(</usr/lib/electron5/version)
+ export npm_config_target=$(</usr/lib/$_electron/version)
export npm_config_disturl=https://electronjs.org/headers
HOME="$srcdir/.electron-gyp" npm install --production
+
+ cat <<-EOF > ../sqlectron-gui
+ #!/usr/bin/sh
+ exec $_electron /usr/lib/sqlectron-gui/app.asar "\$@"
+ EOF
}
package() {
cd "$pkgname-$pkgver"
- install -Dm0755 ../sqlectron-gui.sh "${pkgdir}/usr/bin/sqlectron-gui"
-
- install -Dm0644 build/app.png "${pkgdir}/usr/share/pixmaps/sqlectron-gui.png"
-
asar p app app.asar
- install -Dm0644 -t "${pkgdir}/usr/lib/sqlectron-gui" app.asar
-
- install -Dm0644 -t "${pkgdir}/usr/share/applications" ../sqlectron-gui.desktop
+ install -Dm0755 -t "${pkgdir}/usr/bin" sqlectron-gui
+ install -Dm0644 -t "${pkgdir}/usr/share/applications" ../sqlectron-gui.desktop
+ install -Dm0644 -t "${pkgdir}/usr/lib/sqlectron-gui" app.asar
install -Dm0644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+ install -Dm0644 build/app.png "${pkgdir}/usr/share/pixmaps/sqlectron-gui.png"
+
}
diff --git a/sqlectron-gui.sh b/sqlectron-gui.sh
deleted file mode 100644
index d323428199dd..000000000000
--- a/sqlectron-gui.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/sh
-
-exec electron5 /usr/lib/sqlectron-gui/app.asar "$@"