# HG changeset patch
# User Dan McGregor <dan.mcgregor@usask.ca>
# Date 1452010094 21600
# Node ID 88814d3c0c8b1990e524e5becf1974c6ffc6e9f9
# Parent  99f93dec8fea306bda0bf8a544b1cab47fe2aaca# Parent  3437e2246259f2ba111d40a55df6cea6f788bab5
Merge remote-tracking branch 'github/master' into not-linux

diff -r 3437e2246259 -r 88814d3c0c8b Bootloader/Scripts/easyMode.bash
--- a/Bootloader/Scripts/easyMode.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/Bootloader/Scripts/easyMode.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Just in case there was an extra ledTest.bash (don't care if error)
 rm /dev/ttyACM0
diff -r 3437e2246259 -r 88814d3c0c8b Bootloader/Scripts/generateManufacturingImage.bash
--- a/Bootloader/Scripts/generateManufacturingImage.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/Bootloader/Scripts/generateManufacturingImage.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Combines a given bootloader image and firmware image into a single firmware binary
 # Manufacturing deliverable
 
diff -r 3437e2246259 -r 88814d3c0c8b Bootloader/Scripts/ledTest.bash
--- a/Bootloader/Scripts/ledTest.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/Bootloader/Scripts/ledTest.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 printf "led\r" > /dev/ttyACM0
 
diff -r 3437e2246259 -r 88814d3c0c8b Bootloader/Scripts/swdLoad.bash
--- a/Bootloader/Scripts/swdLoad.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/Bootloader/Scripts/swdLoad.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Loads firmware image using an SWD Flasher
 # Uses MCHCK ruby flasher toolchain
 # NOTE: Only tested with a buspirate on Linux
diff -r 3437e2246259 -r 88814d3c0c8b Keyboards/cmake.bash
--- a/Keyboards/cmake.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/Keyboards/cmake.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This is bash lib file for the convenience build scripts
 # Don't call this script directly
 # Jacob Alexander 2015
diff -r 3437e2246259 -r 88814d3c0c8b Keyboards/ergodox.bash
--- a/Keyboards/ergodox.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/Keyboards/ergodox.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This is a build script template
 # These build scripts are just a convenience for configuring your keyboard (less daunting than CMake)
 # Jacob Alexander 2015
diff -r 3437e2246259 -r 88814d3c0c8b Keyboards/infinity.bash
--- a/Keyboards/infinity.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/Keyboards/infinity.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This is a build script template
 # These build scripts are just a convenience for configuring your keyboard (less daunting than CMake)
 # Jacob Alexander 2015
diff -r 3437e2246259 -r 88814d3c0c8b Keyboards/template.bash
--- a/Keyboards/template.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/Keyboards/template.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This is a build script template
 # These build scripts are just a convenience for configuring your keyboard (less daunting than CMake)
 # Jacob Alexander 2015
diff -r 3437e2246259 -r 88814d3c0c8b Keyboards/whitefox.bash
--- a/Keyboards/whitefox.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/Keyboards/whitefox.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This is a build script template
 # These build scripts are just a convenience for configuring your keyboard (less daunting than CMake)
 # Jacob Alexander 2015
diff -r 3437e2246259 -r 88814d3c0c8b Lib/CMake/sizeCalculator
--- a/Lib/CMake/sizeCalculator	Tue Nov 10 11:24:03 2015 -0800
+++ b/Lib/CMake/sizeCalculator	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #| Jacob Alexander 2014
 #| Arg List
 #| 1 - size binary   (e.g. avr-size)
diff -r 3437e2246259 -r 88814d3c0c8b Lib/CMake/writer
--- a/Lib/CMake/writer	Tue Nov 10 11:24:03 2015 -0800
+++ b/Lib/CMake/writer	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #| Jacob Alexander 2014
 #| Arg List
 #| 1 - File to write to         (e.g. final_chip)
diff -r 3437e2246259 -r 88814d3c0c8b LoadFile/load.dfu
--- a/LoadFile/load.dfu	Tue Nov 10 11:24:03 2015 -0800
+++ b/LoadFile/load.dfu	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Convenience script for loading firmware onto a dfu type device
 # By default, initiates dfu-util
 
diff -r 3437e2246259 -r 88814d3c0c8b LoadFile/load.teensy
--- a/LoadFile/load.teensy	Tue Nov 10 11:24:03 2015 -0800
+++ b/LoadFile/load.teensy	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Convenience script for loading firmware onto a teensy type device
 # By default, initiates teensy-load-cli
 
diff -r 3437e2246259 -r 88814d3c0c8b LoadFile/winload.teensy
--- a/LoadFile/winload.teensy	Tue Nov 10 11:24:03 2015 -0800
+++ b/LoadFile/winload.teensy	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Convenience script for loading firmware onto a teensy type device
 # By default, initiates teensy-load-cli
 
diff -r 3437e2246259 -r 88814d3c0c8b Scan/ISSILed/exampleAPI.bash
--- a/Scan/ISSILed/exampleAPI.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/Scan/ISSILed/exampleAPI.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # ISSILed
 # Virtual Serial Port API Example
 # Jacob Alexander 2015
diff -r 3437e2246259 -r 88814d3c0c8b Scan/STLcd/exampleAPI.bash
--- a/Scan/STLcd/exampleAPI.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/Scan/STLcd/exampleAPI.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # STLcd
 # Virtual Serial Port API Example
 # Jacob Alexander 2015
diff -r 3437e2246259 -r 88814d3c0c8b buildall.bash
--- a/buildall.bash	Tue Nov 10 11:24:03 2015 -0800
+++ b/buildall.bash	Tue Jan 05 10:08:14 2016 -0600
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ###| Builder Script |###
 #
 # Builds all permutations of modules