Merge branch 'smasher816-master'

LoadFile/load.dfu

@@ -54,13 +54,23 @@ fi
 
 # Load via dfu-util
 # Used for McHCK based uCs
+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
+	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

LoadFile/load.teensy

@@ -50,7 +50,7 @@ if [ ! -e teensy-loader-cli/teensy-loader-cli ]; then
 	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 @@ EXIT_STATUS=$?
 
 # Load Screen Session if specified
 if (( "$EXIT_STATUS" == "0" )) && [[ "$AUTO_SCREEN_SESSION" != "" ]]; then
+	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

LoadFile/winload.teensy

@@ -49,7 +49,7 @@ if [ ! -e teensy-loader-cli/teensy-loader-cli ]; then
 	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