update to 0.0.1

3 files changed, 47 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ed46ae450021..4d8a72971475 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,24 @@
 pkgbase = krux-installer-bin
 	pkgdesc = A GUI based application to flash Krux firmware on K210 based devices
-	pkgver = 0.0.1_beta
-	pkgrel = 2
+	pkgver = 0.0.1
+	pkgrel = 1
 	url = https://github.com/selfcustody/krux-installer
 	arch = x86_64
 	license = MIT
 	makedepends = squashfuse
-	depends = electron26
+	depends = electron28
 	depends = libx11
 	depends = gdk-pixbuf2
-	depends = libxext
-	depends = libdbusmenu-glib
 	depends = gtk2
-	depends = dbus-glib
-	provides = krux-installer=0.0.1_beta.2f0ee130
+	depends = java-runtime
+	depends = startup-notification
+	provides = krux-installer=0.0.1
 	conflicts = krux-installer
-	source = krux-installer-0.0.1_beta.AppImage::https://github.com/selfcustody/krux-installer/releases/download/v0.0.1-beta.2f0ee130/krux-installer-0.0.1-beta.AppImage
-	source = krux-installer-0.0.1_beta.AppImage.sig::https://github.com/selfcustody/krux-installer/releases/download/v0.0.1-beta.2f0ee130/krux-installer-0.0.1-beta.AppImage.sig
-	source = LICENSE::https://raw.githubusercontent.com/selfcustody/krux-installer/v0.0.1-beta.2f0ee130/LICENSE
+	source = krux-installer-0.0.1.AppImage::https://github.com/selfcustody/krux-installer/releases/download/v0.0.1/krux-installer_0.0.1_amd64.deb
+	source = LICENSE-0.0.1::https://raw.githubusercontent.com/selfcustody/krux-installer/v0.0.1/LICENSE
 	source = krux-installer.sh
-	validpgpkeys = B4281DDDFBBD207BFA4113138974C90299326322
-	sha256sums = 1d9ca2a004a94438b6c36c9768b5b1ac6d4404a896a021649474be3064f83ade
-	sha256sums = SKIP
+	sha256sums = 02ec46048b0e46ea95ac53c450804cd445b32343144b1a61939ad1d9fc488f4b
 	sha256sums = 29eee3e9d9c5dd67213ec3ab4a7eef57a1224750e2e9aab3a278177a9444a355
-	sha256sums = 6c4570da6a41a5b6e18fee07b0cda0020445199c2462451c596d9871471ceb16
+	sha256sums = 5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf
 
 pkgname = krux-installer-bin
diff --git a/PKGBUILD b/PKGBUILD
index 159b9da99e44..beb4edccc2c9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,52 +2,48 @@
 # Maintainer: qlrd <qlrddev at gmail dot com>
 pkgname=krux-installer-bin
 _pkgname="org.selfcustody.${pkgname%-bin}"
-pkgver=0.0.1_beta
-revision=2f0ee130
-pkgrel=2
+pkgver=0.0.1
+_electronversion=28
+pkgrel=1
 pkgdesc="A GUI based application to flash Krux firmware on K210 based devices"
 arch=('x86_64')
 url="https://github.com/selfcustody/krux-installer"
 license=('MIT')
-provides=("${pkgname%-bin}=${pkgver}.${revision}")
+provides=("${pkgname%-bin}=${pkgver}")
 conflicts=("${pkgname%-bin}")
 depends=(
-    'electron26'
+    "electron${_electronversion}"
     'libx11'
     'gdk-pixbuf2'
-    'libxext'
-    'libdbusmenu-glib'
     'gtk2'
-    'dbus-glib'
+    'java-runtime'
+    'startup-notification'
 )
 makedepends=(
     'squashfuse'
 )
 source=(
-    "${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/v${pkgver//_/-}.${revision}/${pkgname%-bin}-${pkgver//_/-}.AppImage"    
-    "${pkgname%-bin}-${pkgver}.AppImage.sig::${url}/releases/download/v${pkgver//_/-}.${revision}/${pkgname%-bin}-${pkgver//_/-}.AppImage.sig"
-    "LICENSE::https://raw.githubusercontent.com/selfcustody/krux-installer/v${pkgver//_/-}.${revision}/LICENSE"
+    "${pkgname%-bin}-${pkgver}.AppImage::${url}/releases/download/v${pkgver}/${pkgname%-bin}_${pkgver}_amd64.deb"    
+    "LICENSE-${pkgver}::https://raw.githubusercontent.com/selfcustody/krux-installer/v${pkgver}/LICENSE"
     "${pkgname%-bin}.sh"
 )
-sha256sums=('1d9ca2a004a94438b6c36c9768b5b1ac6d4404a896a021649474be3064f83ade'
-            'SKIP'
+sha256sums=('02ec46048b0e46ea95ac53c450804cd445b32343144b1a61939ad1d9fc488f4b'
             '29eee3e9d9c5dd67213ec3ab4a7eef57a1224750e2e9aab3a278177a9444a355'
-            '6c4570da6a41a5b6e18fee07b0cda0020445199c2462451c596d9871471ceb16')
-
-validpgpkeys=(
-    'B4281DDDFBBD207BFA4113138974C90299326322'
-)
-
+            '5ce46265f0335b03568aa06f7b4c57c5f8ffade7a226489ea39796be91a511bf')
 build() {
-    chmod a+x "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage"
-    "${srcdir}/${pkgname%-bin}-${pkgver}.AppImage" --appimage-extract > /dev/null
-    sed "s|AppRun --no-sandbox %U|${pkgname%-bin}|g;s|${_pkgname}|${pkgname%-bin}|g" -i "${srcdir}/squashfs-root/${pkgname%-bin}.desktop"
+    sed -e "s|@electronversion@|${_electronversion}|g" \
+        -e "s|@appname@|${pkgname%-bin}|g" \
+        -e "s|@appasar@|app.asar|g" \
+        -i "${srcdir}/${pkgname%-bin}.sh"
+    bsdtar -xf "${srcdir}/data.tar.xz"
+    sed "s|/opt/${pkgname%-bin}/||g;s|org.selfcustody.${pkgname%-bin}|${pkgname%-bin}|g" \
+        -i "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop"
 }
 package() {
     install -Dm755 "${srcdir}/${pkgname%-bin}.sh" "${pkgdir}/usr/bin/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/squashfs-root/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
-    install -Dm644 "${srcdir}/squashfs-root/usr/lib/"* -t "${pkgdir}/usr/lib/${pkgname%-bin}/lib"
-    install -Dm644 "${srcdir}/squashfs-root/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
-    install -Dm644 "${srcdir}/squashfs-root/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
-    install -Dm644 "${srcdir}/LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}"
+    install -Dm644 "${srcdir}/opt/${pkgname%-bin}/resources/app.asar" -t "${pkgdir}/usr/lib/${pkgname%-bin}"
+    cp -r "${srcdir}/opt/${pkgname%-bin}/resources/app.asar.unpacked" "${pkgdir}/usr/lib/${pkgname%-bin}"
+    install -Dm644 "${srcdir}/usr/share/icons/hicolor/0x0/apps/${pkgname%-bin}.png" -t "${pkgdir}/usr/share/pixmaps"
+    install -Dm644 "${srcdir}/usr/share/applications/${pkgname%-bin}.desktop" -t "${pkgdir}/usr/share/applications"
+    install -Dm644 "${srcdir}/LICENSE-${pkgver}" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
\ No newline at end of file
diff --git a/krux-installer.sh b/krux-installer.sh
index f3b5cac78238..c77c53567639 100644
--- a/krux-installer.sh
+++ b/krux-installer.sh
@@ -1,11 +1,17 @@
-#!/bin/bash
-_ELECTRON=/usr/bin/electron26
-APPDIR=/usr/lib/krux-installer
-export PATH="${APPDIR}:${PATH}"
-export LD_LIBRARY_PATH="${APPDIR}/lib:${LD_LIBRARY_PATH}"
-_ASAR="${APPDIR}/app.asar"
+#!/bin/sh
+set -e
+_APPDIR="/usr/lib/@appname@"
+_ASAR="${_APPDIR}/@appasar@"
+export PATH="${_APPDIR}:${PATH}"
+export LD_LIBRARY_PATH="${_APPDIR}/swiftshader:${_APPDIR}/lib:${LD_LIBRARY_PATH}"
+export ELECTRON_IS_DEV=0
+export NODE_ENV=production
 if [[ $EUID -ne 0 ]] || [[ $ELECTRON_RUN_AS_NODE ]]; then
-    exec ${_ELECTRON} ${_ASAR} "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" "$@"
+    exit
 else
-    exec ${_ELECTRON} ${_ASAR} --no-sandbox "$@"
+    cd "${_APPDIR}"
+    exec electron@electronversion@ "${_ASAR}" --no-sandbox "$@"
+    exit
 fi
\ No newline at end of file