# HG changeset patch
# User Jacob Alexander <haata@kiibohd.com>
# Date 1423989849 28800
# Node ID a133945a31a8428017c800815c4e0b6602fcf333
# Parent  42e801e0b44423842f07879132c0480268c76a9a# Parent  71882cd1c3623da3eec4acde8ac072ada3d64b1d
Merge branch 'smasher816-master'

diff -r 42e801e0b444 -r a133945a31a8 LoadFile/load.dfu
--- a/LoadFile/load.dfu	Wed Feb 11 23:10:00 2015 -0800
+++ b/LoadFile/load.dfu	Sun Feb 15 00:44:09 2015 -0800
@@ -54,13 +54,23 @@
 
 # Load via dfu-util
 # Used for McHCK based uCs
-dfu-util -D @TARGET_BIN@
-EXIT_STATUS=$?
+if type dfu-util &>/dev/null; then
+	dfu-util -D @TARGET_BIN@
+	EXIT_STATUS=$?
+else
+	echo "dfu-util is required to reprogram the device"
+	exit 3
+fi
 
 # Load Screen Session if specified
 if (( "$EXIT_STATUS" == "0" )) && [[ "$AUTO_SCREEN_SESSION" != "" ]]; then
-	sleep 0.1
-	screen $AUTO_SCREEN_SESSION
+	if type screen &>/dev/null; then
+		sleep 0.1
+		screen $AUTO_SCREEN_SESSION
+	else
+		echo "screen is not installed"
+		exit 3
+	fi
 fi
 
 exit $EXIT_STATUS
diff -r 42e801e0b444 -r a133945a31a8 LoadFile/load.teensy
--- a/LoadFile/load.teensy	Wed Feb 11 23:10:00 2015 -0800
+++ b/LoadFile/load.teensy	Sun Feb 15 00:44:09 2015 -0800
@@ -50,7 +50,7 @@
 	mkdir -p teensy-loader-cli
 	cd teensy-loader-cli
 	cmake -G "Unix Makefiles" @CMAKE_SOURCE_DIR@/LoadFile
-	make
+	make || exit 3
 	cd -
 fi
 
@@ -68,8 +68,13 @@
 
 # Load Screen Session if specified
 if (( "$EXIT_STATUS" == "0" )) && [[ "$AUTO_SCREEN_SESSION" != "" ]]; then
-	sleep 0.1
-	screen $AUTO_SCREEN_SESSION
+	if type screen &>/dev/null; then
+		sleep 0.1
+		screen $AUTO_SCREEN_SESSION
+	else
+		echo "screen is not installed"
+		exit 3
+	fi
 fi
 
 exit $EXIT_STATUS
diff -r 42e801e0b444 -r a133945a31a8 LoadFile/winload.teensy
--- a/LoadFile/winload.teensy	Wed Feb 11 23:10:00 2015 -0800
+++ b/LoadFile/winload.teensy	Sun Feb 15 00:44:09 2015 -0800
@@ -49,7 +49,7 @@
 	mkdir -p teensy-loader-cli
 	cd teensy-loader-cli
 	cmake -G "Unix Makefiles" $(cygpath -u @CMAKE_SOURCE_DIR@/LoadFile)
-	make
+	make || exit 3
 	cd -
 fi