diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-12 16:11:43 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-12 16:11:43 +0200 |
| commit | a2f528c5ba20ade8c3be200ed07fb6e925030c0d (patch) | |
| tree | 4b67a981db55183441f553ba967c1faec912e982 /Tools | |
| parent | ee9233451244604f1522dda5e58d1deb7ec6473d (diff) | |
| parent | 4dc65d6f09bcf891ee228ef9fc6b576251fc8b65 (diff) | |
| download | px4-firmware-a2f528c5ba20ade8c3be200ed07fb6e925030c0d.tar.gz px4-firmware-a2f528c5ba20ade8c3be200ed07fb6e925030c0d.tar.bz2 px4-firmware-a2f528c5ba20ade8c3be200ed07fb6e925030c0d.zip | |
Merged master
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/check_submodules.sh | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh index 7c3a3bfc2..cc6e7d1c0 100755 --- a/Tools/check_submodules.sh +++ b/Tools/check_submodules.sh @@ -8,12 +8,17 @@ if [ -d NuttX/nuttx ]; then - STATUSRETVAL=$(git status --porcelain | grep -i "NuttX") - if [ "$STATUSRETVAL" == "" ]; then + STATUSRETVAL=$(git submodule summary | grep -A20 -i "NuttX" | grep "<") + if [ -z "$STATUSRETVAL" ]; then echo "Checked NuttX submodule, correct version found" else echo "NuttX 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 @@ -24,12 +29,17 @@ fi if [ -d mavlink/include/mavlink/v1.0 ]; then - STATUSRETVAL=$(git status --porcelain | grep -i "mavlink/include/mavlink/v1.0") - if [ "$STATUSRETVAL" == "" ]; then + STATUSRETVAL=$(git submodule summary | grep -A20 -i "mavlink/include/mavlink/v1.0" | grep "<") + if [ -z "$STATUSRETVAL" ]; then echo "Checked mavlink submodule, correct version found" else echo "mavlink 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 |