Fix checksums (Release 2)

2 files changed, 19 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4412b67367d4..40bebecdbd7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xampp
 	pkgdesc = A free and open source cross-platform web server package (LAMP Stack), consisting mainly of the Apache HTTP Server, MySQL database, and interpreters for scripts written in the PHP and Perl programming languages
 	pkgver = 5.6.21
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.apachefriends.org/
 	install = xampp.install
 	arch = i686
@@ -17,16 +17,16 @@ pkgbase = xampp
 	md5sums = db1881f9564f18ed34d877035c28a4b8
 	md5sums = cbf909c2c3ad89470463eed2ce003f97
 	md5sums = f214711d95b8135f16974e36128f3a68
-	source_i686 = xampp-installer::https://www.apachefriends.org/xampp-files/5.6.21/xampp-linux-5.6.21-0-installer.run
+	source_i686 = https://www.apachefriends.org/xampp-files/5.6.21/xampp-linux-5.6.21-0-installer.run
 	source_i686 = org.freedesktop.xampp-manager.policy
 	source_i686 = xampp-manager_polkit
 	md5sums_i686 = e134e9a4f8b54e84e02e7745022f7341
 	md5sums_i686 = 5732030b36a892696016481279706808
 	md5sums_i686 = bf75b016a5ce2deff1da3301013766cb
-	source_x86_64 = xampp-installer::https://www.apachefriends.org/xampp-files/5.6.21/xampp-linux-x64-5.6.21-0-installer.run
+	source_x86_64 = https://www.apachefriends.org/xampp-files/5.6.21/xampp-linux-x64-5.6.21-0-installer.run
 	source_x86_64 = org.freedesktop.xampp-manager-x64.policy
 	source_x86_64 = xampp-manager-x64_polkit
-	md5sums_x86_64 = e134e9a4f8b54e84e02e7745022f7341
+	md5sums_x86_64 = 86826f25c52d9960d329b0c087c7327f
 	md5sums_x86_64 = ba7853fd8b3125b0a783753ca5e23447
 	md5sums_x86_64 = 9d246102ea20f27a13d119e57741ce7d
 
diff --git a/PKGBUILD b/PKGBUILD
index 9c3043ff5d7d..388959bc6166 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=xampp
 pkgver=5.6.21
-pkgrel=1
+pkgrel=2
 pkgdesc="A free and open source cross-platform web server package (LAMP Stack), consisting mainly of the Apache HTTP Server, MySQL database, and interpreters for scripts written in the PHP and Perl programming languages"
 url="http://www.apachefriends.org/"
 license=('GPL')
@@ -13,10 +13,10 @@ arch=('i686' 'x86_64')
 depends=('net-tools')
 optdepends=('polkit: to run XAMPP Manager from menu')
 makedepends=('proot')
-source_i686=( "xampp-installer"::"https://www.apachefriends.org/xampp-files/${pkgver}/${pkgname}-linux-${pkgver}-0-installer.run"
+source_i686=( "https://www.apachefriends.org/xampp-files/${pkgver}/${pkgname}-linux-${pkgver}-0-installer.run"
               "org.freedesktop.xampp-manager.policy"
               "xampp-manager_polkit")
-source_x86_64=( "xampp-installer"::"https://www.apachefriends.org/xampp-files/${pkgver}/${pkgname}-linux-x64-${pkgver}-0-installer.run"
+source_x86_64=( "https://www.apachefriends.org/xampp-files/${pkgver}/${pkgname}-linux-x64-${pkgver}-0-installer.run"
                 "org.freedesktop.xampp-manager-x64.policy"
                 "xampp-manager-x64_polkit")
 source=("lampp.service" "xampp-manager.desktop" "xampp-manager.png")
@@ -28,16 +28,24 @@ md5sums=('db1881f9564f18ed34d877035c28a4b8'
 md5sums_i686=('e134e9a4f8b54e84e02e7745022f7341'
               '5732030b36a892696016481279706808'
               'bf75b016a5ce2deff1da3301013766cb')
-md5sums_x86_64=('e134e9a4f8b54e84e02e7745022f7341'
+md5sums_x86_64=('86826f25c52d9960d329b0c087c7327f'
                 'ba7853fd8b3125b0a783753ca5e23447'
                 '9d246102ea20f27a13d119e57741ce7d')
 
 package() {
   install -dm755 "${pkgdir}/opt/lampp"
 
+  if [ "$CARCH" = "i686" ]; then
+    installer="${srcdir}/${pkgname}-linux-${pkgver}-0-installer.run"
+    polkit="${srcdir}/xampp-manager_polkit"
+  else
+    installer="${srcdir}/${pkgname}-linux-x64-${pkgver}-0-installer.run"
+    polkit="${srcdir}/xampp-manager-x64_polkit"
+  fi
+
   msg "Extracting package to a chroot..."
-  chmod +x "${srcdir}/xampp-installer"
-  echo "Y" | proot -b "${pkgdir}/opt/lampp:/opt/lampp" "${srcdir}/xampp-installer" --mode text
+  chmod +x ${installer}
+  echo "Y" | proot -b "${pkgdir}/opt/lampp:/opt/lampp" ${installer} --mode text
   chmod g-s -R "${pkgdir}"/opt/lampp
 
   # Licenses
@@ -48,9 +56,7 @@ package() {
   install -dm755 "${pkgdir}"/usr/bin
   ln -sf /opt/lampp/lampp "${pkgdir}"/usr/bin/xampp
   ln -sf /opt/lampp/lampp "${pkgdir}"/usr/bin/lampp
-  [ "$CARCH" = "i686" ] && install -Dm755 "${srcdir}/xampp-manager_polkit" "${pkgdir}/usr/bin/xampp-manager_polkit"
-  [ "$CARCH" = "x86_64" ] && install -Dm755 "${srcdir}/xampp-manager-x64_polkit" "${pkgdir}/usr/bin/xampp-manager_polkit"
-
+  install -Dm755 ${polkit} "${pkgdir}/usr/bin/xampp-manager_polkit"
 
   # Systemd service
   mkdir -p ${pkgdir}/etc/systemd/system