# HG changeset patch # User Jacob Alexander # Date 1452726230 28800 # Node ID bc047e37ddf1d44b00df37c3b9657268bc9d542e # Parent b4bb195dac76a4ff9393574f641e21ce5c04554e# Parent 98c896e00f9f2a62c8b7bc398f9b7b7389f64331 Merge branch 'master' of github.com:kiibohd/controller diff -r b4bb195dac76 -r bc047e37ddf1 Bootloader/Scripts/easyMode.bash --- a/Bootloader/Scripts/easyMode.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/Bootloader/Scripts/easyMode.bash Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 Bootloader/Scripts/generateManufacturingImage.bash --- a/Bootloader/Scripts/generateManufacturingImage.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/Bootloader/Scripts/generateManufacturingImage.bash Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 Bootloader/Scripts/ledTest.bash --- a/Bootloader/Scripts/ledTest.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/Bootloader/Scripts/ledTest.bash Wed Jan 13 15:03:50 2016 -0800 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash printf "led\r" > /dev/ttyACM0 diff -r b4bb195dac76 -r bc047e37ddf1 Bootloader/Scripts/swdLoad.bash --- a/Bootloader/Scripts/swdLoad.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/Bootloader/Scripts/swdLoad.bash Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 Keyboards/cmake.bash --- a/Keyboards/cmake.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/Keyboards/cmake.bash Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 Keyboards/ergodox.bash --- a/Keyboards/ergodox.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/Keyboards/ergodox.bash Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 Keyboards/infinity.bash --- a/Keyboards/infinity.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/Keyboards/infinity.bash Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 Keyboards/template.bash --- a/Keyboards/template.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/Keyboards/template.bash Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 Keyboards/whitefox.bash --- a/Keyboards/whitefox.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/Keyboards/whitefox.bash Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 Lib/CMake/sizeCalculator --- a/Lib/CMake/sizeCalculator Wed Jan 13 15:03:29 2016 -0800 +++ b/Lib/CMake/sizeCalculator Wed Jan 13 15:03:50 2016 -0800 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash #| Jacob Alexander 2014 #| Arg List #| 1 - size binary (e.g. avr-size) diff -r b4bb195dac76 -r bc047e37ddf1 Lib/CMake/writer --- a/Lib/CMake/writer Wed Jan 13 15:03:29 2016 -0800 +++ b/Lib/CMake/writer Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 LoadFile/load.dfu --- a/LoadFile/load.dfu Wed Jan 13 15:03:29 2016 -0800 +++ b/LoadFile/load.dfu Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 LoadFile/load.teensy --- a/LoadFile/load.teensy Wed Jan 13 15:03:29 2016 -0800 +++ b/LoadFile/load.teensy Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 LoadFile/winload.teensy --- a/LoadFile/winload.teensy Wed Jan 13 15:03:29 2016 -0800 +++ b/LoadFile/winload.teensy Wed Jan 13 15:03:50 2016 -0800 @@ -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 b4bb195dac76 -r bc047e37ddf1 Scan/ISSILed/exampleAPI.bash --- a/Scan/ISSILed/exampleAPI.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/Scan/ISSILed/exampleAPI.bash Wed Jan 13 15:03:50 2016 -0800 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # ISSILed # Virtual Serial Port API Example # Jacob Alexander 2015 diff -r b4bb195dac76 -r bc047e37ddf1 Scan/STLcd/exampleAPI.bash --- a/Scan/STLcd/exampleAPI.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/Scan/STLcd/exampleAPI.bash Wed Jan 13 15:03:50 2016 -0800 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # STLcd # Virtual Serial Port API Example # Jacob Alexander 2015 diff -r b4bb195dac76 -r bc047e37ddf1 buildall.bash --- a/buildall.bash Wed Jan 13 15:03:29 2016 -0800 +++ b/buildall.bash Wed Jan 13 15:03:50 2016 -0800 @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash ###| Builder Script |### # # Builds all permutations of modules