Update to 3987

3 files changed, 22 insertions, 26 deletions

diff --git a/.SRCINFO b/.SRCINFO
index dc96fe64b5d6..b146ef6d0e68 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Fri Jul  7 00:19:49 UTC 2017
+# Mon Oct 23 23:56:55 UTC 2017
 pkgbase = intel-xdk
 	pkgdesc = Cross-platform mobile and IoT development environment
-	pkgver = 3977
+	pkgver = 3987
 	pkgrel = 1
 	url = https://software.intel.com/en-us/intel-xdk
 	arch = i686
@@ -13,9 +13,12 @@ pkgbase = intel-xdk
 	depends = gconf
 	source = intel-xdk
 	source = intel-xdk.desktop
-	source = https://appcenter.html5tools-software.intel.com/api/v3.0/redirect/updates/xdk/xdk_web_linux64_master_3977.tgz
-	sha256sums = f091a3a84380b9bcd2d5daf402e3f73cc071b0f01205e773a32af6651bdce4d3
+	sha256sums = 713961147b32e05ee8f0e97a60920d2254c2c74053fe4bb73f55c69d74b17a37
 	sha256sums = 8e6551d803e6c604e823d2589987c7a85973de69f59ce72660b107d82474dd9b
+	source_i686 = https://appcenter.html5tools-software.intel.com/api/v3.0/redirect/updates/xdk/xdk_web_linux32_master_3987.tgz
+	sha256sums_i686 = a78cf1fbb7c445e5979ba3076214289bf1ef5417911c5ac6044b91c3f0e0dd7f
+	source_x86_64 = https://appcenter.html5tools-software.intel.com/api/v3.0/redirect/updates/xdk/xdk_web_linux64_master_3987.tgz
+	sha256sums_x86_64 = c049c5e7907f0e0a3d021ad85c941edd95132b7b3338cfca5ee74a9403b55ca2
 
 pkgname = intel-xdk
 
diff --git a/PKGBUILD b/PKGBUILD
index 12c41a647f7f..181d0002bffc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,31 @@
 # Maintainer: Gavin Lloyd <gavinhungry@gmail.com>
 
 pkgname=intel-xdk
-pkgver=3977
+pkgver=3987
 pkgrel=1
 pkgdesc='Cross-platform mobile and IoT development environment'
 arch=('i686' 'x86_64')
 url='https://software.intel.com/en-us/intel-xdk'
 license=('custom')
 depends=('libudev0' 'libnotify' 'gconf')
-
 source=('intel-xdk'
         'intel-xdk.desktop')
-sha256sums=('f091a3a84380b9bcd2d5daf402e3f73cc071b0f01205e773a32af6651bdce4d3'
+sha256sums=('713961147b32e05ee8f0e97a60920d2254c2c74053fe4bb73f55c69d74b17a37'
             '8e6551d803e6c604e823d2589987c7a85973de69f59ce72660b107d82474dd9b')
-
-if [ "${CARCH}" == 'i686' ]; then
-  _arch='32'
-  sha256sums+=('d2bb66cc3b2b91e95addcd8a9e1dd974e70ed1f883086fc8904ffb28f73934fa')
-elif [ "${CARCH}" == 'x86_64' ]; then
-  _arch='64'
-  sha256sums+=('c4971e2a9473505b0ba2997588efdf73733891c5adb61c0935d3a0a02758d7c7')
-fi
-
-_base="xdk_web_linux${_arch:-64}"
-source+=("https://appcenter.html5tools-software.intel.com/api/v3.0/redirect/updates/xdk/${_base}_master_${pkgver}.tgz")
+source_i686=("https://appcenter.html5tools-software.intel.com/api/v3.0/redirect/updates/xdk/xdk_web_linux32_master_${pkgver}.tgz")
+sha256sums_i686=('a78cf1fbb7c445e5979ba3076214289bf1ef5417911c5ac6044b91c3f0e0dd7f')
+source_x86_64=("https://appcenter.html5tools-software.intel.com/api/v3.0/redirect/updates/xdk/xdk_web_linux64_master_${pkgver}.tgz")
+sha256sums_x86_64=('c049c5e7907f0e0a3d021ad85c941edd95132b7b3338cfca5ee74a9403b55ca2')
 
 package() {
-  mkdir -p "${pkgdir}/opt/intel/XDK" "${pkgdir}/usr/bin" "${pkgdir}/usr/share/applications" "${pkgdir}/usr/share/licenses/${pkgname}"
+  local _CARCH_BITS=$([ "$CARCH" == i686 ] && echo '32' || echo '64')
+  cd "${srcdir}/xdk_web_linux${_CARCH_BITS}_${pkgver}"/rpm
 
-  cd "${srcdir}/${_base}_${pkgver}/rpm"
-  tar xf "${pkgname}-${pkgver}.0.0.tgz" -C "${pkgdir}/opt/intel/XDK"
+  install -dm755 "${pkgdir}"/opt/intel/XDK
+  tar xf "${pkgname}-${pkgver}.0.0.tgz" -C "${pkgdir}"/opt/intel/XDK
 
-  rm -f "${pkgdir}/opt/intel/XDK/libudev.so.0"
-  install -m755 "${srcdir}/intel-xdk" "${pkgdir}/usr/bin/"
-  install -m644 "${srcdir}/intel-xdk.desktop" "${pkgdir}/usr/share/applications/"
-  install -m644 "${pkgdir}/opt/intel/XDK/xdk/LICENSE.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  rm -f "${pkgdir}"/opt/intel/XDK/libudev.so.0
+  install -Dm755 "${srcdir}"/intel-xdk "${pkgdir}"/usr/bin/intel-xdk
+  install -Dm644 "${srcdir}"/intel-xdk.desktop "${pkgdir}"/usr/share/applications/intel-xdk.desktop
+  install -Dm644 "${pkgdir}"/opt/intel/XDK/xdk/LICENSE.txt "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
diff --git a/intel-xdk b/intel-xdk
index bffa350d9b57..49f0cb5895a6 100644
--- a/intel-xdk
+++ b/intel-xdk
@@ -1,3 +1,3 @@
 #!/bin/bash
 
-cd /opt/intel/XDK && ./xdk.sh
+cd /opt/intel/XDK && exec ./xdk.sh