diff options
| author | Pavel Kirienko <pavel.kirienko@gmail.com> | 2014-07-12 17:45:05 +0400 |
|---|---|---|
| committer | Pavel Kirienko <pavel.kirienko@gmail.com> | 2014-07-12 17:45:05 +0400 |
| commit | 024c8213a10d83743caea21206d21f3de497b18a (patch) | |
| tree | 8feb09ec786be3eae390046936c186a0fe5c5270 /Tools/check_submodules.sh | |
| parent | 9a56892c2b48f7cd25358f9d21076443ef252eff (diff) | |
| download | px4-firmware-024c8213a10d83743caea21206d21f3de497b18a.tar.gz px4-firmware-024c8213a10d83743caea21206d21f3de497b18a.tar.bz2 px4-firmware-024c8213a10d83743caea21206d21f3de497b18a.zip | |
Fixed check_submodules.sh for UAVCAN
Diffstat (limited to 'Tools/check_submodules.sh')
| -rwxr-xr-x | Tools/check_submodules.sh | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh index abe3088c7..8fd9a8f00 100755 --- a/Tools/check_submodules.sh +++ b/Tools/check_submodules.sh @@ -46,14 +46,22 @@ else fi -if [ -d uavcan/libuavcan_drivers ]; +if [ -d uavcan ] then - STATUSRETVAL=$(git status --porcelain | grep -i uavcan) - if [ "$STATUSRETVAL" == "" ]; then + STATUSRETVAL=$(git submodule summary | grep -A20 -i uavcan | grep "<") + if [ -z "$STATUSRETVAL" ] + then echo "Checked uavcan submodule, correct version found" else - echo "uavcan sub repo not at correct version. Try 'make updatesubmodules'" + echo "" + echo "" + echo "uavcan sub repo not at correct version. Try 'git submodule update'" echo "or follow instructions on http://pixhawk.org/dev/git/submodules" + echo "" + echo "" + echo "New commits required:" + echo "$(git submodule summary)" + echo "" exit 1 fi else |