Update to v3.20

2 files changed, 16 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f46a45eb6ad5..4faec5f2416f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Fri Jan  8 02:21:13 UTC 2016
 pkgbase = microchip-mplabx-bin
 	pkgdesc = IDE for Microchip PIC and dsPIC development
-	pkgver = 3.15
+	pkgver = 3.20
 	pkgrel = 1
 	url = http://www.microchip.com/mplabx
 	install = microchip-mplabx-bin.install
@@ -28,10 +30,10 @@ pkgbase = microchip-mplabx-bin
 	options = emptydirs
 	options = !zipman
 	options = !upx
-	backup = opt/microchip/mplabx/v3.15/mplab_ide/etc/mplab_ide.conf
-	source = http://ww1.microchip.com/downloads/en/DeviceDoc/MPLABX-v3.15-linux-installer.tar
+	backup = opt/microchip/mplabx/v3.20/mplab_ide/etc/mplab_ide.conf
+	source = http://ww1.microchip.com/downloads/en/DeviceDoc/MPLABX-v3.20-linux-installer.tar
 	source = LICENSE
-	md5sums = 9391c04f5650cb180f4c908c573096c7
+	md5sums = adf7da90435f52e4b0920b2e5c10132f
 	md5sums = a34a85b2600a26f1c558bcd14c2444bd
 	source_x86_64 = fakechroot-i686.pkg.tar.xz::http://www.archlinux.org/packages/extra/i686/fakechroot/download/
 	makedepends_x86_64 = lib32-fakeroot
diff --git a/PKGBUILD b/PKGBUILD
index 666cc251c9d4..a991870591a7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Submitter: BxS <bxsbxs at gmail dot com>
 
 pkgname=microchip-mplabx-bin
-pkgver=3.15
+pkgver=3.20
 pkgrel=1
 pkgdesc="IDE for Microchip PIC and dsPIC development"
 arch=(i686 x86_64)
@@ -28,7 +28,7 @@ install="${pkgname}.install"
 _mplabx_dir="/opt/microchip/mplabx/v${pkgver}"
 _mplabx_installer="MPLABX-v${pkgver}-linux-installer"
 
-_mplabcomm_version=3.16.00
+_mplabcomm_version=3.16.02
 _mplabcomm_installer="MPLABCOMM-v${_mplabcomm_version}-linux-installer"
 _mplabcomm_dir="/opt/microchip/mplabcomm/v${_mplabcomm_version}"
 
@@ -36,11 +36,11 @@ source=("http://ww1.microchip.com/downloads/en/DeviceDoc/${_mplabx_installer}.ta
         "LICENSE")
 source_x86_64=("fakechroot-i686.pkg.tar.xz::http://www.archlinux.org/packages/extra/i686/fakechroot/download/")
 
-md5sums=('9391c04f5650cb180f4c908c573096c7'
+md5sums=('adf7da90435f52e4b0920b2e5c10132f'
          'a34a85b2600a26f1c558bcd14c2444bd')
 md5sums_x86_64=('92b9a1dc8fa0534048790731a7bf2fc5')
 
-backup=("${_mplabx_dir:1}/mplab_ide/etc/mplab_ide.conf")
+backup=("etc/mplab_ide.conf")
 
 PKGEXT='.pkg.tar'
 
@@ -79,7 +79,7 @@ EOF
   sed -i 's/^default_options="/default_options="-J-Dawt.useSystemAAFontSettings=on /' "${pkgdir}${_mplabx_dir}/mplab_ide/etc/mplab_ide.conf"
 
   # Fix broken udev rules
-  sed -i '1c \ACTION!="add", SUBSYSTEM!="usb_device", GOTO="jlink_rules_end"\r' "${pkgdir}/etc/udev/rules.d/99-jlink.rules"
+  sed -i '/^BUS!="usb"/c \ACTION!="add", SUBSYSTEM!="usb_device", GOTO="jlink_rules_end"\r' "${pkgdir}/etc/udev/rules.d/99-jlink.rules"
 
   # Patch jdkhome to use system JRE
   local conf
@@ -88,6 +88,11 @@ EOF
   done
   sed -i '/^"$jdkhome"bin\/java/c\ java -jar '${_mplabx_dir}'/mplab_ipe/ipe.jar' "${pkgdir}${_mplabx_dir}/mplab_ipe/mplab_ipe"
 
+  # Move config file to /etc (and add a symlink into the old location)
+  mv "${pkgdir}${_mplabx_dir}/mplab_ide/etc/mplab_ide.conf" "${pkgdir}/etc/"
+
+  ln -sf /etc/mplab_ide.conf "${pkgdir}${_mplabx_dir}/mplab_ide/etc/"
+
   # Remove bundled JRE
   rm -rf "${pkgdir}${_mplabx_dir}/sys/java"
   rmdir "${pkgdir}${_mplabx_dir}/sys" # the intent here is to fail if something else than java is put into sys.