Release 0.96.5

2 files changed, 19 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bbeb668e0d6d..322fb3a7d1c1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Apr 27 20:23:34 UTC 2018
+# Tue Feb 19 18:22:39 UTC 2019
 pkgbase = armory
 	pkgdesc = Full-featured Bitcoin wallet management application
-	pkgver = 0.96.4
+	pkgver = 0.96.5
 	pkgrel = 1
 	url = https://github.com/goatpig/BitcoinArmory
 	install = armory.install
@@ -26,9 +26,9 @@ pkgbase = armory
 	conflicts = armory-git
 	conflicts = armory-bin
 	conflicts = armory-goatpig-git
-	source = https://github.com/goatpig/BitcoinArmory/releases/download/v0.96.4/armory_0.96.4_src.tar
+	source = https://github.com/goatpig/BitcoinArmory/releases/download/v0.96.5/armory_0.96.5_source.tar.xz
 	source = run-armory.sh
-	sha512sums = a7dd1c1c10c5e45696fa0abdee3e5f465260db2b7b0a06cac553597ca87a4d72c9b0c9e212c9f8c8196c32727fb55fd0a82bfafbe01e7ef57208df7df17390f5
+	sha512sums = aba9627a58414d9a5b9781753d6c09b3970f2728f317419b3dc8547a8ad2b9e7f9615a650a56441122647406ea846c64383677f220f26ef395029cdb8d25812c
 	sha512sums = af44a8edfdf751f3343a8bdf6fa21c125389de3435c4b03c7f581b980525a9f32af177f496830f847b70c8e2619c42908536698e0fd28f862f16083cf7396715
 
 pkgname = armory
diff --git a/PKGBUILD b/PKGBUILD
index 31f8231a4c15..998cb78d3459 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: Pieter Kokx <pieter@kokx.nl>
 
 pkgname=armory
-pkgver=0.96.4
+pkgver=0.96.5
 pkgrel=1
 pkgdesc="Full-featured Bitcoin wallet management application"
 arch=('i686' 'x86_64')
@@ -20,12 +20,14 @@ install="${pkgname}.install"
 
 # Don't blindly trust a random AUR package with your coins! Signed hashes available at
 # https://github.com/goatpig/BitcoinArmory/releases with GPG ID 8C5211764922589A
-_signatures="https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/sha256sum.asc"
-source=("https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/armory_${pkgver}_src.tar"
+_signatures="https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/sha256sum.txt.asc"
+source=("https://github.com/goatpig/BitcoinArmory/releases/download/v${pkgver}/armory_${pkgver}_source.tar.xz"
         'run-armory.sh')
-sha512sums=('a7dd1c1c10c5e45696fa0abdee3e5f465260db2b7b0a06cac553597ca87a4d72c9b0c9e212c9f8c8196c32727fb55fd0a82bfafbe01e7ef57208df7df17390f5'
+sha512sums=('aba9627a58414d9a5b9781753d6c09b3970f2728f317419b3dc8547a8ad2b9e7f9615a650a56441122647406ea846c64383677f220f26ef395029cdb8d25812c'
             'af44a8edfdf751f3343a8bdf6fa21c125389de3435c4b03c7f581b980525a9f32af177f496830f847b70c8e2619c42908536698e0fd28f862f16083cf7396715')
 
+_parentdir=Armory3
+
 check() {
   msg 'Validating GPG signature...'
   msg2 '(To disable: remove/rename check() function from PKGBUILD)'
@@ -36,12 +38,12 @@ check() {
   msg2 'GPG signature is valid.'
 
   msg 'Validating signed checksum of downloaded binary...'
-  grep "${pkgver}_src.tar" 'sha256sum.asc' | tr -d '\r' | sha256sum -c -
+  grep "${pkgver}_source.tar.xz" 'sha256sum.asc' | tr -d '\r' | sha256sum -c -
   msg2 'Checksum valid.'
 }
 
 prepare() {
-  cd "$srcdir/${pkgname}_${pkgver}_src"
+  cd "$srcdir/$_parentdir"
 
   ## Get Python2 Version
   _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
@@ -50,7 +52,7 @@ prepare() {
 }
 
 build() {
-  cd "$srcdir/${pkgname}_${pkgver}_src"
+  cd "$srcdir/$_parentdir"
 
   ## Get Python2 Version
   _py2longver=$(pacman -Qi python2 | grep "Version" | sed 's/^Version\s*:\s//')
@@ -62,16 +64,16 @@ build() {
 }
 
 package() {
-  install -Dm644 "$srcdir/${pkgname}_${pkgver}_src/dpkgfiles/armory.desktop" "$pkgdir/usr/share/applications/armory.desktop"
-  install -Dm644 "$srcdir/${pkgname}_${pkgver}_src/dpkgfiles/armoryoffline.desktop" "$pkgdir/usr/share/applications/armoryoffline.desktop"
-  install -Dm644 "$srcdir/${pkgname}_${pkgver}_src/dpkgfiles/armorytestnet.desktop" "$pkgdir/usr/share/applications/armorytestnet.desktop"
-  install -Dm644 "$srcdir/${pkgname}_${pkgver}_src/img/armory_icon_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_64x64.png"
-  install -Dm644 "$srcdir/${pkgname}_${pkgver}_src/img/armory_icon_green_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_green_64x64.png"
+  install -Dm644 "$srcdir/${_parentdir}/dpkgfiles/armory.desktop" "$pkgdir/usr/share/applications/armory.desktop"
+  install -Dm644 "$srcdir/${_parentdir}/dpkgfiles/armoryoffline.desktop" "$pkgdir/usr/share/applications/armoryoffline.desktop"
+  install -Dm644 "$srcdir/${_parentdir}/dpkgfiles/armorytestnet.desktop" "$pkgdir/usr/share/applications/armorytestnet.desktop"
+  install -Dm644 "$srcdir/${_parentdir}/img/armory_icon_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_64x64.png"
+  install -Dm644 "$srcdir/${_parentdir}/img/armory_icon_green_64x64.png" "$pkgdir/usr/share/armory/img/armory_icon_green_64x64.png"
 
   install -Dm 755 "$srcdir/run-armory.sh" "$pkgdir/usr/bin/armory"
 
   mkdir -p "$pkgdir/opt"
-  cp -R "$srcdir/${pkgname}_${pkgver}_src/." "$pkgdir/opt/$pkgname/"
+  cp -R "$srcdir/${_parentdir}/." "$pkgdir/opt/$pkgname/"
 
   mkdir -p "$pkgdir/usr/local/bin"
   ln -s "$pkgdir/usr/bin/$pkgname" "$pkgdir/usr/local/bin/$pkgname"