aboutsummaryrefslogtreecommitdiff
path: root/Tools/check_submodules.sh
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2014-07-07 22:20:55 +0200
committerLorenz Meier <lm@inf.ethz.ch>2014-07-07 22:20:55 +0200
commit2eb018b2730d5b3ceeca430aabbf39cf560ce9fc (patch)
tree79a21a40b46f36b6a9e90914533b65b47892831a /Tools/check_submodules.sh
parent6a8990b3baac40cf0b4ef7a8ea3bdda73d3513e6 (diff)
downloadpx4-firmware-2eb018b2730d5b3ceeca430aabbf39cf560ce9fc.tar.gz
px4-firmware-2eb018b2730d5b3ceeca430aabbf39cf560ce9fc.tar.bz2
px4-firmware-2eb018b2730d5b3ceeca430aabbf39cf560ce9fc.zip
bugfixes for checks and tools
Diffstat (limited to 'Tools/check_submodules.sh')
-rwxr-xr-xTools/check_submodules.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/Tools/check_submodules.sh b/Tools/check_submodules.sh
index 1156490d7..fb180ef47 100755
--- a/Tools/check_submodules.sh
+++ b/Tools/check_submodules.sh
@@ -2,11 +2,11 @@
if [ -d NuttX/nuttx ];
then
- STATUSRETVAL=$(git status --porcelain | grep -i "mavlink/include/mavlink/v1.0")
+ STATUSRETVAL=$(git status --porcelain | grep -i "NuttX")
if [ "$STATUSRETVAL" == "" ]; then
- echo "Checked mavlink submodule, correct version found"
+ echo "Checked NuttX submodule, correct version found"
else
- echo "mavlink sub repo not at correct version. Try 'make updatesubmodules'"
+ echo "NuttX sub repo not at correct version. Try 'make updatesubmodules'"
echo "or follow instructions on http://pixhawk.org/dev/git/submodules"
exit 1
fi
@@ -18,11 +18,11 @@ fi
if [ -d mavlink/include/mavlink/v1.0 ];
then
- STATUSRETVAL=$(git status --porcelain | grep -i "NuttX")
+ STATUSRETVAL=$(git status --porcelain | grep -i "mavlink/include/mavlink/v1.0")
if [ "$STATUSRETVAL" == "" ]; then
- echo "Checked NuttX submodule, correct version found"
+ echo "Checked mavlink submodule, correct version found"
else
- echo "NuttX sub repo not at correct version. Try 'make updatesubmodules'"
+ echo "mavlink sub repo not at correct version. Try 'make updatesubmodules'"
echo "or follow instructions on http://pixhawk.org/dev/git/submodules"
exit 1
fi