From 53b9eb4b36bd64b01689a3773f11baaae6a71eff Mon Sep 17 00:00:00 2001
From: Arti Zirk <arti.zirk@gmail.com>
Date: Tue, 27 Jul 2021 17:42:24 +0300
Subject: [PATCH] Bump version and simplify PKGBUILD

Thanks escape0707 for pointing out direct nupkg download
---
 .SRCINFO      | 13 ++++++-------
 .gitignore    |  2 +-
 PKGBUILD      | 26 ++++++++++----------------
 authy.desktop |  2 +-
 4 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index c9719bf..7b439d1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,19 @@
 pkgbase = authy-desktop-win32-bin
 	pkgdesc = Two-Factor Authentication from your PC. Converted from Windows electron version
-	pkgver = 1.8.3
-	pkgrel = 3
+	pkgver = 1.8.4
+	pkgrel = 1
 	url = https://authy.com/
 	arch = x86_64
 	license = unknown
 	makedepends = npm
-	makedepends = p7zip
+	makedepends = unzip
 	makedepends = asar
 	depends = electron9
 	provides = authy
 	conflicts = authy
-	source = https://s3.amazonaws.com/authy-electron-repository-production/authy/stable/1.8.3/win32/x64/Authy%20Desktop%20Setup%201.8.3.exe
+	source = https://s3.amazonaws.com/authy-electron-repository-production/authy/stable/1.8.4/win32/x64/authy-1.8.4-full.nupkg
 	source = authy.desktop
-	md5sums = 630362cf725391d1fc86c9a4d06f0161
-	md5sums = f02a27fe07bf9924c462838a6340d14d
+	sha1sums = 0cc919351a05be403ab366bec4f8961df5817b40
+	sha1sums = 5eaa6f0152eeaf93740dfcd2a94b5fbf6b6c4984
 
 pkgname = authy-desktop-win32-bin
-
diff --git a/.gitignore b/.gitignore
index cc92795..af82e3e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 pkg
 src
 *tar*
-*.exe
+*.nupkg
diff --git a/PKGBUILD b/PKGBUILD
index 27b8cfd..a6e5ab8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Arti Zirk <arti.zirk@gmail.com>
 # Contributor: Timmy Yao <timmy.yao+aur@gmail.com>
 pkgname=authy-desktop-win32-bin
-pkgver=1.8.3
-pkgrel=3
+pkgver=1.8.4
+pkgrel=1
 pkgdesc="Two-Factor Authentication from your PC. Converted from Windows electron version"
 arch=("x86_64")
 provides=('authy')
@@ -10,29 +10,23 @@ conflicts=('authy')
 url="https://authy.com/"
 license=('unknown')
 depends=('electron9')
-makedepends=('npm' 'p7zip' 'asar')
-source=("https://s3.amazonaws.com/authy-electron-repository-production/authy/stable/${pkgver}/win32/x64/Authy%20Desktop%20Setup%20${pkgver}.exe"
+makedepends=('npm' 'unzip' 'asar')
+source=("https://s3.amazonaws.com/authy-electron-repository-production/authy/stable/${pkgver}/win32/x64/authy-${pkgver}-full.nupkg"
         "authy.desktop")
-md5sums=('630362cf725391d1fc86c9a4d06f0161'
-         'f02a27fe07bf9924c462838a6340d14d')
+sha1sums=("0cc919351a05be403ab366bec4f8961df5817b40"
+          "5eaa6f0152eeaf93740dfcd2a94b5fbf6b6c4984")
 
 build() {
 	cd "$srcdir"
-	7z x "Authy%20Desktop%20Setup%20${pkgver}.exe" -o"$pkgname-$pkgver" -y
-	
-	cd "$pkgname-$pkgver"
-	7z x "authy-$pkgver-full.nupkg" -y
 
-	mkdir app.asar
-	asar e lib/net45/resources/app.asar app.asar
+	unzip -j "authy-$pkgver-full.nupkg" lib/net45/resources/app.asar
+	asar extract-file lib/net45/resources/app.asar img/logos/icon128.png
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
+	cd "$srcdir"
 
-	install -Dm644  -t "${pkgdir}"/usr/lib/authy \
-		lib/net45/resources/app.asar \
-		app.asar/img/logos/icon128.png
+	install -Dm644  -t "${pkgdir}"/usr/lib/authy app.asar icon128.png
 	install -Dm644 "$srcdir"/authy.desktop -t "$pkgdir"/usr/share/applications
 }
 
diff --git a/authy.desktop b/authy.desktop
index fbb27bf..b913d0c 100644
--- a/authy.desktop
+++ b/authy.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=1.8.3
+Version=1.0
 Type=Application
 Terminal=false
 Exec=/usr/bin/electron9 --app /usr/lib/authy/app.asar