From 72e5dd930a53496f1b1c8f03ce7e50645671ccd8 Mon Sep 17 00:00:00 2001 From: radius Date: Wed, 2 Mar 2016 00:59:56 -0500 Subject: [PATCH] fix submodules --- libretro-buildbot-recipe.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libretro-buildbot-recipe.sh b/libretro-buildbot-recipe.sh index 09f3f788..8b2be280 100755 --- a/libretro-buildbot-recipe.sh +++ b/libretro-buildbot-recipe.sh @@ -1396,10 +1396,6 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then echo "pulling changes from repo... " git reset --hard OUT=`git pull` - if [ "${TYPE}" == "SUBMODULE" ]; then - git submodule foreach git pull origin master - fi - echo $OUT if [ "${TYPE}" = "PROJECT" ]; then RADIR=$DIR @@ -1408,15 +1404,25 @@ if [ "${PLATFORM}" = "android" ] && [ "${RA}" = "YES" ]; then else BUILD="YES" fi + elif [ "${TYPE}" = "SUBMODULE" ]; then + if [[ $OUT == *"Already up-to-date"* ]]; then + BUILD="NO" + else + BUILD="YES" + git submodule foreach git pull origin master + fi fi cd $WORK else echo "cloning repo..." cd $PARENTDIR + echo REPO TYPE: $TYPE git clone "$URL" "$DIR" --depth=1 if [ "${TYPE}" == "SUBMODULE" ]; then + echo "updating submodules..." git submodule update --init + git submodule foreach git pull origin master fi cd $DIR if [ "${TYPE}" = "PROJECT" ]; then