di0ib
/
controller
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

Check for needed programs 

Check for dfu-util and screen before using them. Also aborts if
teensy_loader_cli compilation fails.

Uses the type builtin to determine if a command exists. See here:
https://gist.github.com/sdelmas/7377271
simple
Rowan Decker 9 years ago
parent
88ace02e51
commit
8d4adb41ec
3 changed files with 23 additions and 8 deletions
Split View Show Diff Stats
  1. 14
    4
      LoadFile/load.dfu
  2. 8
    3
      LoadFile/load.teensy
  3. 1
    1
      LoadFile/winload.teensy

+ 14
- 4
LoadFile/load.dfu View File

@@ -54,13 +54,23 @@ fi

# 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

+ 8
- 3
LoadFile/load.teensy View File

@@ -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
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

+ 1
- 1
LoadFile/winload.teensy View File

@@ -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