From a8f255ddd4d87ee56fb95cefce73ece015b2a42e Mon Sep 17 00:00:00 2001
From: Wouter Jansen <wouter.jansen@uantwerpen.be>
Date: Wed, 4 Dec 2024 13:23:02 +0100
Subject: [PATCH 1/2] fixed clang

---
 setup.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.sh b/setup.sh
index c997a425..1742b890 100755
--- a/setup.sh
+++ b/setup.sh
@@ -43,7 +43,7 @@ else # linux
     # install clang and build tools
     VERSION=$(lsb_release -rs | cut -d. -f1)
     if [ "$VERSION" -gt "22" ]; then
-        clang_version='18'
+        clang_version='16'
         cpp_version='14'
     elif [ "$VERSION" -gt "20" ]; then
         clang_version='12'

From 6300b30ac4c1527e1694fbc493a2076374e7b595 Mon Sep 17 00:00:00 2001
From: Wouter Jansen <wouter.jansen@uantwerpen.be>
Date: Wed, 4 Dec 2024 14:43:55 +0100
Subject: [PATCH 2/2] reverted scrips to fix build errors

---
 build.sh | 22 +++++-----------------
 setup.sh | 43 +++++++++++++++----------------------------
 2 files changed, 20 insertions(+), 45 deletions(-)

diff --git a/build.sh b/build.sh
index fd1422a4..f15c82cf 100755
--- a/build.sh
+++ b/build.sh
@@ -63,24 +63,12 @@ if [ "$(uname)" == "Darwin" ]; then
     export CC="$(brew --prefix)/opt/llvm/bin/clang"
     export CXX="$(brew --prefix)/opt/llvm/bin/clang++"
 else
-    VERSION=$(lsb_release -rs | cut -d. -f1)
     if $gcc; then
-        if [ "$VERSION" -gt "22" ]; then
-            export CC="gcc-13"
-            export CXX="g++-13"
-        else
-            export CC="gcc-12"
-            export CXX="g++-12"
-        fi
+        export CC="gcc-12"
+        export CXX="g++-12"
     else
-        export CXXFLAGS="-stdlib=libstdc++"
-        if [ "$VERSION" -gt "22" ]; then
-            export CC="clang-16"
-            export CXX="clang++-16"
-        else
-            export CC="clang-12"
-            export CXX="clang++-12"
-        fi
+        export CC="clang-12"
+        export CXX="clang++-12"
     fi
 fi
 
@@ -145,7 +133,7 @@ set +x
 echo ""
 echo ""
 echo "==============================="
-echo " Cosys-AirSim plugin is built! "
+echo " Cosys-AirSim plugin is built!."
 echo "==============================="
 echo ""
 echo "For further info see for installation see:"
diff --git a/setup.sh b/setup.sh
index 1742b890..f6d1ee91 100755
--- a/setup.sh
+++ b/setup.sh
@@ -30,7 +30,7 @@ if [ "$(uname)" == "Darwin" ]; then # osx
     brew update
     # Update below line for newer versions
     brew install llvm@8
-else # linux
+else #linux
     sudo apt-get update
     sudo apt-get -y install --no-install-recommends \
         lsb-release \
@@ -40,24 +40,15 @@ else # linux
         libvulkan1 \
         vulkan-tools
 
-    # install clang and build tools
+    #install clang and build tools
     VERSION=$(lsb_release -rs | cut -d. -f1)
-    if [ "$VERSION" -gt "22" ]; then
-        clang_version='16'
-        cpp_version='14'
-    elif [ "$VERSION" -gt "20" ]; then
-        clang_version='12'
-        cpp_version='12'
-    else
-        clang_version='12'
-        cpp_version='10'
-    fi
-    sudo apt-get install -y \
-        clang-$clang_version \
-        clang++-$clang_version \
-        libc++-$clang_version-dev \
-        libc++abi-$clang_version-dev \
-        libstdc++-$cpp_version-dev
+    # Since Ubuntu 17 clang is part of the core repository
+    # See https://packages.ubuntu.com/search?keywords=clang-8
+    # if [ "$VERSION" -lt "17" ]; then
+    #     wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
+    #     sudo apt-get update
+    # fi
+    sudo apt-get install -y clang-12 clang++-12 libc++-12-dev libc++abi-12-dev libstdc++-12-dev
 fi
 
 if ! which cmake; then
@@ -98,10 +89,9 @@ else #linux
     sudo apt-get install -y build-essential unzip libunwind-dev
 
     if version_less_than_equal_to $cmake_ver $MIN_CMAKE_VERSION; then
-        VERSION=$(lsb_release -rs | cut -d. -f1)
-        # For Ubuntu 18 and up, avoid building cmake from scratch to save time
-        # ref: https://apt.kitware.com
-        if [ "$VERSION" -ge "18" ]; then
+        # in ubuntu 18 docker CI, avoid building cmake from scratch to save time
+        # ref: https://apt.kitware.com/
+        if [ "$(lsb_release -rs)" == "18.04" ]; then
             sudo apt-get -y install \
                 apt-transport-https \
                 ca-certificates \
@@ -198,9 +188,6 @@ popd >/dev/null
 
 set +x
 echo ""
-echo ""
-echo "============================================"
-echo " Cosys-AirSim setup completed successfully! "
-echo "============================================"
-echo ""
-echo "Run ./build.sh to compile."
+echo "******************************************"
+echo "Cosys-AirSim setup completed successfully!"
+echo "******************************************"
\ No newline at end of file