fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Better output on submodule check fail

Browse Source
This commit is contained in:
Lorenz Meier 2016-01-12 10:33:24 +01:00
parent e9dd2aec48
commit 7d7333cdea
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Tools/check_submodules.sh
View File

@ -17,17 +17,23 @@ if [ -d $1 ];
if [ -z "$STATUSRETVAL" ]; then if [ -z "$STATUSRETVAL" ]; then
echo "Checked $1 submodule, correct version found" echo "Checked $1 submodule, correct version found"
else else
echo -e "\033[31mChecked $1 submodule, ACTION REQUIRED:" echo -e "\033[31mChecked $1 submodule, ACTION REQUIRED:\033[0m"
echo ""
echo "" echo ""
echo -e "New commits required:" echo -e "New commits required:"
echo -e "$SUBMODULE_STATUS\033[0m" echo -e "$SUBMODULE_STATUS"
echo "" echo ""
echo "" echo ""
echo " $1 submodule not at correct version. Did you intentionally change the submodule?" echo -e " *******************************************************************************"
echo " If yes, hit 'y' and <ENTER> to continue the build. If not, hit <ENTER> to abort." echo -e " * \033[31mIF YOU DID NOT CHANGE THIS FILE (OR YOU DON'T KNOW WHAT A SUBMODULE IS):\033[0m *"
echo -e " Hit 'u' and <ENTER> to update ALL submodules and resolve this (performs \033[94mgit submodule update --init --recursive\033[0m)." echo -e " * \033[31mHit 'u' and <ENTER> to update ALL submodules and resolve this.\033[0m *"
echo -e " Use \033[94mgit add $1 && git commit -m 'Updated $1'\033[0m to choose this submodule version (careful!)" echo -e " * (performs \033[94mgit submodule update --init --recursive\033[0m) *"
echo -e " *******************************************************************************"
echo ""
echo ""
echo -e " Only for EXPERTS:"
echo -e " $1 submodule is not in the recommended version."
echo -e " Hit 'y' and <ENTER> to continue the build with this version. Hit <ENTER> to resolve manually."
echo -e " Use \033[94mgit add $1 && git commit -m 'Updated $1'\033[0m to choose this version (careful!)"
echo "" echo ""
read user_cmd read user_cmd
if [ "$user_cmd" == "y" ] if [ "$user_cmd" == "y" ]