diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-10 16:14:21 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-10 16:14:21 +0200 |
| commit | 5bb8c501122de7daece58c5770b6aca13c0066cd (patch) | |
| tree | a39259c91ca48a97e1093a389a5050171cb27065 /Tools | |
| parent | 58cae259e40a3dcab132f42348d57767fca600a1 (diff) | |
| download | px4-firmware-5bb8c501122de7daece58c5770b6aca13c0066cd.tar.gz px4-firmware-5bb8c501122de7daece58c5770b6aca13c0066cd.tar.bz2 px4-firmware-5bb8c501122de7daece58c5770b6aca13c0066cd.zip | |
Fixed the submodule check logic
Diffstat (limited to 'Tools')
| -rwxr-xr-x | Tools/check_submodules.sh | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh index db81ed04a..a56de681f 100755 --- a/Tools/check_submodules.sh +++ b/Tools/check_submodules.sh @@ -2,12 +2,19 @@ if [ -d NuttX/nuttx ]; then - STATUSRETVAL=$(git status --porcelain | grep -i "NuttX") + 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 'make updatesubmodules'" + echo "" + echo "" + 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 @@ -18,12 +25,19 @@ fi if [ -d mavlink/include/mavlink/v1.0 ]; then - STATUSRETVAL=$(git status --porcelain | grep -i "mavlink/include/mavlink/v1.0") + 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 'make updatesubmodules'" + echo "" + echo "" + 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 |