From 7ed517bf15ea938b86624c9f2617a5fa86c876e7 Mon Sep 17 00:00:00 2001
From: xavisolesoft <xavisolesoft@gmail.com>
Date: Fri, 3 May 2024 09:11:58 +0100
Subject: [PATCH] Try to build CARLA even it was already downloaded

---
 Setup.sh | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/Setup.sh b/Setup.sh
index 522d9e607..0bced86ce 100755
--- a/Setup.sh
+++ b/Setup.sh
@@ -79,25 +79,28 @@ elif [ -d ../UnrealEngine5_carla ]; then
     echo -e '\n#CARLA UnrealEngine5\nexport CARLA_UNREAL_ENGINE_PATH='$CARLA_UNREAL_ENGINE_PATH >> ~/.bashrc
     popd
     popd
-    #TODO: Check if UnrealEngine binary file exists and if not build it
 else
     echo "Found UnrealEngine5 $CARLA_UNREAL_ENGINE_PATH - FAIL"
     echo "Cloning CARLA UnrealEngine5..."
     pushd ..
     git clone -b ue5-dev-carla https://github.com/CarlaUnreal/UnrealEngine.git UnrealEngine5_carla
     pushd UnrealEngine5_carla
-    echo "Setup CARLA UnrealEngine5..."
-    ./Setup.sh
-    echo "GenerateProjectFiles CARLA UnrealEngine5..."
-    ./GenerateProjectFiles.sh
-    echo "Build CARLA UnrealEngine5..."
-    make
     echo -e '\n#CARLA UnrealEngine5\nexport CARLA_UNREAL_ENGINE_PATH='$PWD >> ~/.bashrc
     export CARLA_UNREAL_ENGINE_PATH=$PWD
     popd
     popd
     echo "CARLA UnrealEngine5 Installed..."
 fi
+pushd ..
+pushd UnrealEngine5_carla
+echo "Setup CARLA UnrealEngine5..."
+./Setup.sh --force
+echo "GenerateProjectFiles CARLA UnrealEngine5..."
+./GenerateProjectFiles.sh
+echo "Build CARLA UnrealEngine5..."
+make
+popd
+popd
 
 echo "Configuring CARLA..."
 retry --until=success --times=10 -- cmake -G Ninja -S . -B Build --toolchain=$PWD/CMake/LinuxToolchain.cmake -DLAUNCH_ARGS="-prefernvidia" -DCMAKE_BUILD_TYPE=Release -DENABLE_ROS2=ON -DBUILD_CARLA_UNREAL=ON -DCARLA_UNREAL_ENGINE_PATH=$CARLA_UNREAL_ENGINE_PATH