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