Revamp and bump version.

2 files changed, 60 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f3803b47d32b..e89ab7a9f846 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,25 @@
 pkgbase = ubports-installer
 	pkgdesc = A simple tool to install Ubuntu Touch on UBports devices
-	pkgver = 0.9.7_beta
-	pkgrel = 2
+	pkgver = 0.10.0
+	pkgrel = 1
 	url = https://github.com/ubports/ubports-installer
 	arch = x86_64
 	arch = i686
 	license = GPL3
+	makedepends = npm
+	makedepends = nodejs
+	makedepends = electron
 	depends = android-tools
 	depends = android-udev
 	depends = electron
 	depends = e2fsprogs
 	depends = heimdall
+	depends = p7zip
 	conflicts = ubports-installer-git
 	conflicts = ubports-installer-bin
 	options = !strip
 	options = !emptydirs
-	source = ubports-installer-0.9.7_beta.deb::https://github.com/ubports/ubports-installer/releases/download/0.9.7-beta/ubports-installer_0.9.7-beta_linux_amd64.deb
-	sha256sums = e318ad3f5d66016231228efeb254e9ea2e9a911b34c9f003fcfcecf21316bfd0
+	source = ubports-installer-0.10.0.tar.gz::https://github.com/ubports/ubports-installer/archive/refs/tags/0.10.0.tar.gz
+	sha256sums = 9962c0e44c28c13e5e77b16804514721009e899b035615edbf404a9bf1a08259
 
 pkgname = ubports-installer
diff --git a/PKGBUILD b/PKGBUILD
index da20a81a5892..055bf9ae7eb7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,19 +1,62 @@
-# Maintainer: Duy Truong <jimreynold2nd@yahoo.com>
+# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
+# Contributor: Duy Truong <jimreynold2nd@yahoo.com>
+
 pkgname=ubports-installer
-pkgver=0.9.7_beta
-_ver=${pkgver//_/-}
-pkgrel=2
+pkgver=0.10.0
+pkgrel=1
 pkgdesc='A simple tool to install Ubuntu Touch on UBports devices'
 arch=('x86_64' 'i686')
 url='https://github.com/ubports/ubports-installer'
 license=('GPL3')
-depends=('android-tools' 'android-udev' 'electron' 'e2fsprogs' 'heimdall')
+depends=('android-tools' 'android-udev' 'electron' 'e2fsprogs' 'heimdall' 'p7zip')
+makedepends=('npm' 'nodejs' 'electron')
 options=('!strip' '!emptydirs')
 conflicts=('ubports-installer-git' 'ubports-installer-bin')
-source=("$pkgname-$pkgver.deb::https://github.com/ubports/ubports-installer/releases/download/$_ver/ubports-installer_${_ver}_linux_amd64.deb")
-sha256sums=('e318ad3f5d66016231228efeb254e9ea2e9a911b34c9f003fcfcecf21316bfd0')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/ubports/${pkgname}/archive/refs/tags/${pkgver}.tar.gz")
+sha256sums=('9962c0e44c28c13e5e77b16804514721009e899b035615edbf404a9bf1a08259')
+
+_srcdir="$pkgname-$pkgver"
+
+prepare() {
+	cd "$_srcdir"
+	
+	npm ci
+}
+
+build() {
+	cd "$_srcdir"
+	
+	npm run build
+	./node_modules/.bin/electron-builder --linux --x64 --dir -c.electronDist=/usr/lib/electron -c.electronVersion="$(cat /usr/lib/electron/version)"
+}
 
 package() {
-        tar xf data.tar.xz -C "${pkgdir}"
-        install -D -m644 "${pkgdir}/opt/ubports-installer/resources/app.asar.unpacked/node_modules/universalify/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+	cd "$_srcdir"
+	
+	find ./dist/linux-unpacked/resources/app.asar.unpacked -type d \( -name linux -o -name mac -o -name win32 -o -name darwin \) -print -exec rm -rf {} + &>/dev/null
+	install -dm755 "$pkgdir/usr/share/${pkgname}"
+	cp -rt "$pkgdir/usr/share/${pkgname}" dist/linux-unpacked/*
+	
+	cd build/icons
+	for i in *x*.png; do
+		install -Dm644 "$i" "$pkgdir/usr/share/icons/hicolor/${i%.png}/apps/ubports-installer.png"
+	done
+	
+	install -Dm755 <(cat << EOF
+#!/usr/bin/env sh
+USE_SYSTEM_7ZA=true USE_SYSTEM_TOOLS=1 electron /usr/share/${pkgname}/resources/app.asar "\$@"
+EOF
+	) "${pkgdir}/usr/bin/${pkgname}"
+	
+	install -Dm644 <(cat << EOF
+[Desktop Entry]
+Name=UBports Installer
+Comment=UBports Installer
+Exec=${pkgname} %U
+Terminal=false
+Type=Application
+Icon=${pkgname}
+Categories=System
+EOF
+	) "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 }