Merge remote-tracking branch 'upstream/master'

drivers/linux/45-maple.rules

@@ -1,5 +0,0 @@
-ATTRS{idProduct}=="1001", ATTRS{idVendor}=="0110", MODE="664", GROUP="plugdev"
-ATTRS{idProduct}=="1002", ATTRS{idVendor}=="0110", MODE="664", GROUP="plugdev"
-ATTRS{idProduct}=="0003", ATTRS{idVendor}=="1eaf", MODE="664", GROUP="plugdev" SYMLINK+="maple"
-ATTRS{idProduct}=="0004", ATTRS{idVendor}=="1eaf", MODE="664", GROUP="plugdev" SYMLINK+="maple"
-

drivers/linux/install-udev-rules.sh

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-if sudo [ -w /etc/udev/rules.d ]; then
-    echo "Copying Maple-specific udev rules..."
-    sudo cp -v 45-maple.rules /etc/udev/rules.d/45-maple.rules
-    sudo chown root:root /etc/udev/rules.d/45-maple.rules
-    sudo chmod 644 /etc/udev/rules.d/45-maple.rules
-    echo "Reloading udev rules"
-    sudo udevadm control --reload-rules
-else
-    echo "Couldn't copy to /etc/udev/rules.d/; you probably have to run this script as root? Or your distribution of Linux doesn't include udev; try running the IDE itself as root."
-fi
-

tools/linux/install-udev-rules.sh

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if sudo [ -w /etc/udev/rules.d ]; then
-    echo "Copying Maple-specific udev rules..."
-    sudo cp -v 45-maple.rules /etc/udev/rules.d/45-maple.rules
-    sudo chown root:root /etc/udev/rules.d/45-maple.rules
-    sudo chmod 644 /etc/udev/rules.d/45-maple.rules
-else
-    echo "Couldn't copy to /etc/udev/rules.d/; you probably have to run this script as root? Or your distribution of Linux doesn't include udev; try running the IDE itself as root."
-fi

tools/macosx/maple_upload

@@ -39,7 +39,8 @@ else
     dfuse_addr=""
 fi
 
-DFU_UTIL=/usr/local/bin/dfu-util
+#DFU_UTIL=/usr/local/bin/dfu-util
+DFU_UTIL=${DIR}/dfu-util/dfu-util
 if [ ! -x ${DFU_UTIL} ]; then
     DFU_UTIL=/opt/local/bin/dfu-util
 fi