upgpkg: sqlectron-gui 1.29.0

15 files changed, 88 insertions, 80 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7b785444bd1b..513275fd0dbd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,35 +1,19 @@
 pkgbase = sqlectron-gui
-	pkgdesc = A simple and lightweight SQL client desktop with cross database and platform support.
-	pkgver = 1.25.0
+	pkgdesc = A simple and lightweight SQL client with cross database and platform support
+	pkgver = 1.29.0
 	pkgrel = 1
 	url = https://sqlectron.github.io/
 	arch = x86_64
 	license = MIT
-	depends = libnotify
-	source = Sqlectron.sh
-	source = Sqlectron.desktop
-	source = Sqlectron-16x16.png
-	source = Sqlectron-24x24.png
-	source = Sqlectron-32x32.png
-	source = Sqlectron-48x48.png
-	source = Sqlectron-64x64.png
-	source = Sqlectron-96x96.png
-	source = Sqlectron-128x128.png
-	source = Sqlectron-256x256.png
-	source = Sqlectron-512x512.png
-	md5sums = 58802570c7d263582272aab558f9ce47
-	md5sums = ff57c64abc7b2f8a5e2c384750312d59
-	md5sums = 85d6ce586470159c1fc3722c0df19fa7
-	md5sums = 3f2b8a5e1a3efa6fb2d40ff03f11475c
-	md5sums = 2ead1b0701b8b251693f436b2a44ba87
-	md5sums = 8f7c8a7de028f08063357a94f657282f
-	md5sums = 45c7f72fa9db966e52bb55d4f2568ac5
-	md5sums = 791f35bb9d3602620a0f2c3f7b9630ab
-	md5sums = b3e2568f1044efaa5113f1b14c51f377
-	md5sums = e1d936527e73ada838cd97b144c87174
-	md5sums = d68539a49b186bfdb4c461b0ee52442b
-	source_x86_64 = https://github.com/sqlectron/sqlectron-gui/releases/download/v1.25.0/Sqlectron-1.25.0.tar.gz
-	md5sums_x86_64 = 4f954f9654d656cf1877e6f047357c03
+	makedepends = npm
+	makedepends = asar
+	depends = electron
+	source = https://github.com/sqlectron/sqlectron-gui/archive/v1.29.0.tar.gz
+	source = sqlectron-gui.sh
+	source = sqlectron-gui.desktop
+	sha1sums = 86d1a0be812eb636ba09eafadcf95c494423bd82
+	sha1sums = e0e7c83e47f368543a3c4505cf035d570e0d645b
+	sha1sums = b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f
 
 pkgname = sqlectron-gui
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..d4a6d10f7cfe
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.tar.gz
+*.pkg.tar.*
+pkg/
+src/
diff --git a/PKGBUILD b/PKGBUILD
index 0625e1b4acb8..fde60fb876c8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,53 +1,71 @@
-# Maintainer: Edison Ibañez <edison@opmbx.org>
+# Maintainer: surefire@cryptomile.net
+# Contributor: Edison Ibañez <edison@opmbx.org>
+
 pkgname=sqlectron-gui
-pkgver=1.25.0
+pkgver=1.29.0
 pkgrel=1
-pkgdesc="A simple and lightweight SQL client desktop with cross database and platform support."
+pkgdesc="A simple and lightweight SQL client with cross database and platform support"
 arch=('x86_64')
 url="https://sqlectron.github.io/"
-license=("MIT")
-
-source=("Sqlectron.sh"
-        "Sqlectron.desktop"
-        "Sqlectron-16x16.png"
-        "Sqlectron-24x24.png"
-        "Sqlectron-32x32.png"
-        "Sqlectron-48x48.png"
-        "Sqlectron-64x64.png"
-        "Sqlectron-96x96.png"
-        "Sqlectron-128x128.png"
-        "Sqlectron-256x256.png"
-        "Sqlectron-512x512.png")
-source_x86_64=("https://github.com/sqlectron/$pkgname/releases/download/v$pkgver/Sqlectron-$pkgver.tar.gz")
-md5sums=('58802570c7d263582272aab558f9ce47'
-         'ff57c64abc7b2f8a5e2c384750312d59'
-         '85d6ce586470159c1fc3722c0df19fa7'
-         '3f2b8a5e1a3efa6fb2d40ff03f11475c'
-         '2ead1b0701b8b251693f436b2a44ba87'
-         '8f7c8a7de028f08063357a94f657282f'
-         '45c7f72fa9db966e52bb55d4f2568ac5'
-         '791f35bb9d3602620a0f2c3f7b9630ab'
-         'b3e2568f1044efaa5113f1b14c51f377'
-         'e1d936527e73ada838cd97b144c87174'
-         'd68539a49b186bfdb4c461b0ee52442b')
-md5sums_x86_64=('4f954f9654d656cf1877e6f047357c03')
-
-depends=('libnotify')
+license=('MIT')
+depends=('electron')
+makedepends=('npm' 'asar')
+source=("https://github.com/sqlectron/sqlectron-gui/archive/v${pkgver}.tar.gz"
+        'sqlectron-gui.sh'
+		'sqlectron-gui.desktop')
+
+sha1sums=('86d1a0be812eb636ba09eafadcf95c494423bd82'
+          'e0e7c83e47f368543a3c4505cf035d570e0d645b'
+          'b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f')
+
+prepare() {
+	cd "$pkgname-$pkgver"
+
+	# remove extra dependencies
+	sed -i package.json \
+		-e '/"postinstall":/            d' \
+		-e '/"electron":/               d' \
+		-e '/"electron-builder":/       d' \
+		-e '/"spawn-auto-restart":/     d' \
+		-e '/"webpack-dev-middleware":/ d' \
+		-e '/"webpack-dev-server":/     d' \
+		-e '/"webpack-bundle-analyzer":/ s/,$//'
+}
+
+build() {
+	cd "$pkgname-$pkgver"
+
+	CXXFLAGS+=" -I/usr/include/node" \
+		npm install --build-from-source --nodedir=/usr/include/node
+	npm run compile:browser
+	npm run compile:renderer
+
+	mkdir app
+	mv -t ./app out
+	cp -t ./app package.json
+
+	pushd app
+	npm install \
+		--production \
+		--build-from-source \
+		--nodedir=/usr/lib/electron/node \
+		--runtime=electron \
+		--target=$(electron -v)
+
+	popd
+	asar p app app.asar
+}
 
 package() {
-  install -dm 755 "$pkgdir/opt"
-  cp -rf "$srcdir/Sqlectron-$pkgver" "$pkgdir/opt/Sqlectron"
-  install -dm 775 "$pkgdir/opt/Sqlectron"
-  install -dm 755 "$pkgdir/usr/bin/"
-  install -Dm 775 "Sqlectron.sh" "$pkgdir/usr/bin/sqlectron"
-  install -Dm 644 "$srcdir/Sqlectron.desktop" "$pkgdir/usr/share/applications/Sqlectron.desktop"
-  install -Dm 644 "$srcdir/Sqlectron-16x16.png" "$pkgdir/usr/share/icons/hicolor/16x16/apps/Sqlectron.png"
-  install -Dm 644 "$srcdir/Sqlectron-24x24.png" "$pkgdir/usr/share/icons/hicolor/24x24/apps/Sqlectron.png"
-  install -Dm 644 "$srcdir/Sqlectron-32x32.png" "$pkgdir/usr/share/icons/hicolor/32x32/apps/Sqlectron.png"
-  install -Dm 644 "$srcdir/Sqlectron-48x48.png" "$pkgdir/usr/share/icons/hicolor/48x48/apps/Sqlectron.png"
-  install -Dm 644 "$srcdir/Sqlectron-64x64.png" "$pkgdir/usr/share/icons/hicolor/64x64/apps/Sqlectron.png"
-  install -Dm 644 "$srcdir/Sqlectron-96x96.png" "$pkgdir/usr/share/icons/hicolor/96x96/apps/Sqlectron.png"
-  install -Dm 644 "$srcdir/Sqlectron-128x128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/Sqlectron.png"
-  install -Dm 644 "$srcdir/Sqlectron-256x256.png" "$pkgdir/usr/share/icons/hicolor/256x256/apps/Sqlectron.png"
-  install -Dm 644 "$srcdir/Sqlectron-512x512.png" "$pkgdir/usr/share/icons/hicolor/512x512/apps/Sqlectron.png"
+	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"
+
+	install -Dm0644 -t "${pkgdir}/usr/lib/sqlectron-gui" app.asar
+
+	install -Dm0644 -t "${pkgdir}/usr/share/applications"  ../sqlectron-gui.desktop
+
+	install -Dm0644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
 }
diff --git a/Sqlectron-128x128.png b/Sqlectron-128x128.png
deleted file mode 100644
index 4d21a8b1313a..000000000000
--- a/Sqlectron-128x128.png
+++ /dev/null
diff --git a/Sqlectron-16x16.png b/Sqlectron-16x16.png
deleted file mode 100644
index cc1c8fef4703..000000000000
--- a/Sqlectron-16x16.png
+++ /dev/null
diff --git a/Sqlectron-24x24.png b/Sqlectron-24x24.png
deleted file mode 100644
index 930d0d9a5da3..000000000000
--- a/Sqlectron-24x24.png
+++ /dev/null
diff --git a/Sqlectron-256x256.png b/Sqlectron-256x256.png
deleted file mode 100644
index e7e6da32cf94..000000000000
--- a/Sqlectron-256x256.png
+++ /dev/null
diff --git a/Sqlectron-32x32.png b/Sqlectron-32x32.png
deleted file mode 100644
index 140257dd0269..000000000000
--- a/Sqlectron-32x32.png
+++ /dev/null
diff --git a/Sqlectron-48x48.png b/Sqlectron-48x48.png
deleted file mode 100644
index b9477e2ac5ef..000000000000
--- a/Sqlectron-48x48.png
+++ /dev/null
diff --git a/Sqlectron-512x512.png b/Sqlectron-512x512.png
deleted file mode 100644
index fcc0533c8e74..000000000000
--- a/Sqlectron-512x512.png
+++ /dev/null
diff --git a/Sqlectron-64x64.png b/Sqlectron-64x64.png
deleted file mode 100644
index 8106c9b3fda7..000000000000
--- a/Sqlectron-64x64.png
+++ /dev/null
diff --git a/Sqlectron-96x96.png b/Sqlectron-96x96.png
deleted file mode 100644
index fb480762692e..000000000000
--- a/Sqlectron-96x96.png
+++ /dev/null
diff --git a/Sqlectron.sh b/Sqlectron.sh
deleted file mode 100644
index 529f63f7abb0..000000000000
--- a/Sqlectron.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-/opt/Sqlectron/sqlectron &
diff --git a/Sqlectron.desktop b/sqlectron-gui.desktop
index 89752b810c0b..0e5427603847 100644
--- a/Sqlectron.desktop
+++ b/sqlectron-gui.desktop
@@ -1,7 +1,9 @@
 [Desktop Entry]
-Name=Sqlectron
+Type=Application
+Name=Sqlectron-gui
 Comment=A simple and lightweight SQL client with cross database and platform support
-Exec="/opt/Sqlectron/sqlectron"
+Icon=sqlectron-gui
+Exec=sqlectron-gui %U
+Categories=Development;Utility;
+StartupNotify=false
 Terminal=false
-Type=Application
-Icon=Sqlectron
diff --git a/sqlectron-gui.sh b/sqlectron-gui.sh
new file mode 100644
index 000000000000..c4a5ba8fe6c9
--- /dev/null
+++ b/sqlectron-gui.sh
@@ -0,0 +1,3 @@
+#!/usr/bin/sh
+
+exec electron /usr/lib/sqlectron-gui/app.asar "$@"