Update to v4.8.0

2 files changed, 24 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0c9804d0e665..0ee4575fc201 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = archi
 	pkgdesc = Free, open source, cross-platform tool and editor to create ArchiMate models.
-	pkgver = 4.7.1
-	pkgrel = 2
+	pkgver = 4.8.0
+	pkgrel = 1
 	url = http://www.archimatetool.com/
 	arch = x86_64
 	license = MIT
@@ -9,11 +9,11 @@ pkgbase = archi
 	depends = bash
 	optdepends = webkitgtk2: hints view support
 	provides = archi
-	source = https://www.archimatetool.com/downloads/archi/Archi-Linux64-4.7.1.tgz
+	source = https://www.archimatetool.com/downloads/a480/Archi-Linux64-4.8.0.tgz
 	source = archi.desktop
 	source = archi-launcher.sh
 	source = LICENSE
-	md5sums = 5cb570ed7f355d916cfee5f0c6082d6c
+	md5sums = 21e72cc220d2a7da2000e8e60fd20f3d
 	md5sums = 7b9a0cf8e67790ff9ca1afc6578e3adc
 	md5sums = 7813e905142baeb290d396e349beeb13
 	md5sums = 66653b079752362c3e9fc7142027cb7e
diff --git a/PKGBUILD b/PKGBUILD
index c8bf92d2c34f..feb241ede1c3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,11 @@
 # Contributor: Marco Donadoni <marcodonadoni at live dot it>
 # Contributor: Jeroen Rijken <jeroen dot rijken at gmail dot com>
 pkgname=archi
-pkgver=4.7.1
-pkgrel=2
+_pkgver_major=4
+_pkgver_minor=8
+_pkgver_patch=0
+pkgver=${_pkgver_major}.${_pkgver_minor}.${_pkgver_patch}
+pkgrel=1
 pkgdesc="Free, open source, cross-platform tool and editor to create ArchiMate models."
 arch=('x86_64')
 url="http://www.archimatetool.com/"
@@ -12,37 +15,37 @@ license=('MIT')
 depends=('java-runtime-openjdk=8' 'bash')
 optdepends=('webkitgtk2: hints view support')
 provides=('archi')
-source=("https://www.archimatetool.com/downloads/archi/Archi-Linux64-$pkgver.tgz"
-        "$pkgname.desktop"
-        "$pkgname-launcher.sh"
-        'LICENSE')
-md5sums=('5cb570ed7f355d916cfee5f0c6082d6c'
+source=("https://www.archimatetool.com/downloads/a${_pkgver_major}${_pkgver_minor}${_pkgver_patch}/Archi-Linux64-${pkgver}.tgz"
+        "${pkgname}.desktop"
+        "${pkgname}-launcher.sh"
+        "LICENSE")
+md5sums=('21e72cc220d2a7da2000e8e60fd20f3d'
          '7b9a0cf8e67790ff9ca1afc6578e3adc'
          '7813e905142baeb290d396e349beeb13'
          '66653b079752362c3e9fc7142027cb7e')
 
 package() {
-  cd "$srcdir"
+  cd "${srcdir}"
 
   # Docs
-  install -d "$pkgdir/usr/share/doc/$pkgname"
-  install -m644 Archi/docs/*       "$pkgdir/usr/share/doc/$pkgname/"
+  install -d "${pkgdir}/usr/share/doc/${pkgname}"
+  install -m644 Archi/docs/*       "${pkgdir}/usr/share/doc/${pkgname}/"
 
   # Icon and desktop file
-  install -Dm644 Archi/icon.xpm     "$pkgdir/usr/share/pixmaps/$pkgname.xpm"
-  install -Dm644 "$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 Archi/icon.xpm     "${pkgdir}/usr/share/pixmaps/${pkgname}.xpm"
+  install -Dm644 "${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop"
 
   # Launcher
-  install -Dm755 "$pkgname-launcher.sh" "$pkgdir/usr/bin/$pkgname"
+  install -Dm755 "${pkgname}-launcher.sh" "${pkgdir}/usr/bin/${pkgname}"
 
   # Copy binaries
   rm -R Archi/docs
   rm Archi/icon.xpm Archi/Archi-Ubuntu.sh
-  install -d "$pkgdir/opt"
-  cp -R Archi/ "$pkgdir/opt/$pkgname"
-  chmod 755 "$pkgdir/opt/$pkgname/Archi"
+  install -d "${pkgdir}/opt"
+  cp -R Archi/ "${pkgdir}/opt/${pkgname}"
+  chmod 755 "${pkgdir}/opt/${pkgname}/Archi"
 
   # Install license
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }