From f9ca7b55772d7218c4eab8f14629e51ea0c5fa29 Mon Sep 17 00:00:00 2001
From: bernat <bernatx@gmail.com>
Date: Fri, 8 Jan 2021 17:54:14 +0100
Subject: [PATCH] Make /Plugins/ folder optional when packaging

---
 Util/BuildTools/Package.bat | 6 ++++--
 Util/BuildTools/Package.sh  | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Util/BuildTools/Package.bat b/Util/BuildTools/Package.bat
index 5d34f3682..190d25ff0 100644
--- a/Util/BuildTools/Package.bat
+++ b/Util/BuildTools/Package.bat
@@ -173,9 +173,8 @@ if %DO_COPY_FILES%==true (
     echo f | xcopy /y "!XCOPY_FROM!Docs\release_readme.md"                          "!XCOPY_TO!README"
     echo f | xcopy /y "!XCOPY_FROM!Util\Docker\Release.Dockerfile"                  "!XCOPY_TO!Dockerfile"
     echo f | xcopy /y "!XCOPY_FROM!PythonAPI\carla\dist\*.egg"                      "!XCOPY_TO!PythonAPI\carla\dist\"
-    echo f | xcopy /y /s "!XCOPY_FROM!PythonAPI\carla\data\*"                          "!XCOPY_TO!PythonAPI\carla\data\"
+    echo f | xcopy /y /s "!XCOPY_FROM!PythonAPI\carla\data\*"                       "!XCOPY_TO!PythonAPI\carla\data\"
     echo d | xcopy /y /s "!XCOPY_FROM!Co-Simulation"                                "!XCOPY_TO!Co-Simulation"
-    echo d | xcopy /y /s "!XCOPY_FROM!Plugins"                                      "!XCOPY_TO!Plugins"
     echo d | xcopy /y /s "!XCOPY_FROM!PythonAPI\carla\agents"                       "!XCOPY_TO!PythonAPI\carla\agents"
     echo f | xcopy /y "!XCOPY_FROM!PythonAPI\carla\scene_layout.py"                 "!XCOPY_TO!PythonAPI\carla\"
     echo f | xcopy /y "!XCOPY_FROM!PythonAPI\carla\requirements.txt"                "!XCOPY_TO!PythonAPI\carla\"
@@ -186,6 +185,9 @@ if %DO_COPY_FILES%==true (
     echo f | xcopy /y "!XCOPY_FROM!PythonAPI\util\requirements.txt"                 "!XCOPY_TO!PythonAPI\util\"
     echo f | xcopy /y "!XCOPY_FROM!Unreal\CarlaUE4\Content\Carla\HDMaps\*.pcd"      "!XCOPY_TO!HDMaps\"
     echo f | xcopy /y "!XCOPY_FROM!Unreal\CarlaUE4\Content\Carla\HDMaps\Readme.md"  "!XCOPY_TO!HDMaps\README"
+    if exist "!XCOPY_FROM!Plugins" (
+        echo d | xcopy /y /s "!XCOPY_FROM!Plugins"                                  "!XCOPY_TO!Plugins"
+    )
 )
 
 rem ==============================================================================
diff --git a/Util/BuildTools/Package.sh b/Util/BuildTools/Package.sh
index b25b22225..78321db40 100755
--- a/Util/BuildTools/Package.sh
+++ b/Util/BuildTools/Package.sh
@@ -163,7 +163,9 @@ if ${DO_CARLA_RELEASE} ; then
 
   copy_if_changed "./Co-Simulation/" "${DESTINATION}/Co-Simulation/"
 
-  copy_if_changed "./Plugins/" "${DESTINATION}/Plugins/"
+  if [ -d "./Plugins/" ] ; then
+    copy_if_changed "./Plugins/" "${DESTINATION}/Plugins/"
+  fi
 
   copy_if_changed "./Unreal/CarlaUE4/Content/Carla/HDMaps/*.pcd" "${DESTINATION}/HDMaps/"
   copy_if_changed "./Unreal/CarlaUE4/Content/Carla/HDMaps/Readme.md" "${DESTINATION}/HDMaps/README"