From 488a56fcabe681beb04fa9ffb8fc3909ce895cc4 Mon Sep 17 00:00:00 2001
From: Daniel Novillo Villarejo <dnovillocvc@gmail.com>
Date: Fri, 25 Jan 2019 11:34:41 +0100
Subject: [PATCH] Rollback of DefaultGame.ini Solve FILE_NAME never used change
 if mkdir for mkdir -f in a couple of files

---
 Unreal/CarlaUE4/Config/DefaultGame.ini |  4 ++--
 Util/BuildTools/BuildCarlaUE4.sh       |  4 +---
 Util/BuildTools/Package.sh             |  2 +-
 Util/ImportMaps.sh                     | 12 ++----------
 4 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/Unreal/CarlaUE4/Config/DefaultGame.ini b/Unreal/CarlaUE4/Config/DefaultGame.ini
index 25c8cbaf2..25bd56729 100644
--- a/Unreal/CarlaUE4/Config/DefaultGame.ini
+++ b/Unreal/CarlaUE4/Config/DefaultGame.ini
@@ -27,7 +27,7 @@ ForDistribution=False
 IncludeDebugFiles=False
 BlueprintNativizationMethod=Disabled
 bIncludeNativizedAssetsInProjectGeneration=False
-UsePakFile=False
+UsePakFile=True
 bGenerateChunks=False
 bGenerateNoChunks=False
 bChunkHardReferencesOnly=False
@@ -48,11 +48,11 @@ bCookMapsOnly=False
 bCompressed=False
 bEncryptIniFiles=False
 bEncryptPakIndex=False
+bSkipEditorContent=False
 +MapsToCook=(FilePath="/Game/Carla/Maps/Town01")
 +MapsToCook=(FilePath="/Game/Carla/Maps/Town02")
 +MapsToCook=(FilePath="/Game/Carla/Maps/Town03")
 +DirectoriesToAlwaysCook=(Path="Carla/Static/GenericMaterials/Licenseplates/Textures")
-bSkipEditorContent=True
 +DirectoriesToAlwaysStageAsUFS=(Path="Carla/Maps/OpenDrive")
 bNativizeBlueprintAssets=False
 bNativizeOnlySelectedBlueprints=False
diff --git a/Util/BuildTools/BuildCarlaUE4.sh b/Util/BuildTools/BuildCarlaUE4.sh
index c3002ad9e..2f4f17cc2 100755
--- a/Util/BuildTools/BuildCarlaUE4.sh
+++ b/Util/BuildTools/BuildCarlaUE4.sh
@@ -121,9 +121,7 @@ if ${BUILD_CARLAUE4} ; then
 
   #Providing the user with the ExportedMaps folder
   EXPORTED_MAPS="${CARLAUE4_ROOT_FOLDER}/Content/Carla/ExportedMaps"
-  if [ ! -d "${EXPORTED_MAPS}" ]; then
-    mkdir "${EXPORTED_MAPS}"
-  fi
+  mkdir -p "${EXPORTED_MAPS}"
 
 
 fi
diff --git a/Util/BuildTools/Package.sh b/Util/BuildTools/Package.sh
index 4863fbaac..b5a312be9 100755
--- a/Util/BuildTools/Package.sh
+++ b/Util/BuildTools/Package.sh
@@ -93,7 +93,7 @@ if $DO_COPY_FILES ; then
 
   pushd ${CARLA_ROOT_FOLDER} >/dev/null
 
-  mkdir "${DESTINATION}/ExportedMaps"
+  mkdir -p "${DESTINATION}/ExportedMaps"
 
   copy_if_changed "./LICENSE" "${DESTINATION}/LICENSE"
   copy_if_changed "./CHANGELOG.md" "${DESTINATION}/CHANGELOG"
diff --git a/Util/ImportMaps.sh b/Util/ImportMaps.sh
index 107c39964..2189cc1c2 100755
--- a/Util/ImportMaps.sh
+++ b/Util/ImportMaps.sh
@@ -6,12 +6,11 @@
 
 DOC_STRING="Unpack and copy over CarlaUE4's Exported Maps"
 
-USAGE_STRING="Usage: $0 [-h|--help] [-d|--dir] <outdir> [-f|--file] <filename>"
+USAGE_STRING="Usage: $0 [-h|--help] [-d|--dir] <outdir>"
 
 OUTPUT_DIRECTORY=""
-FILE_NAME=""
 
-OPTS=`getopt -o h,d::,f --long help,dir::,file:: -n 'parse-options' -- "$@"`
+OPTS=`getopt -o h,d:: --long help,dir:: -n 'parse-options' -- "$@"`
 
 if [ $? != 0 ] ; then echo "$USAGE_STRING" ; exit 2; fi
 
@@ -22,9 +21,6 @@ while true; do
     --dir )
       OUTPUT_DIRECTORY="$2"
       shift ;;
-    --file )
-      FILE_NAME="$2"
-      shift ;;
     -h | --help )
       echo "$DOC_STRING"
       echo "$USAGE_STRING"
@@ -35,10 +31,6 @@ while true; do
   esac
 done
 
-if [ -z "${FILE_NAME}" ]; then
-  FILE_NAME="CookedExportedMaps"
-fi
-
 #Tar.gz the stuff
 for filepath in `find ExportedMaps/ -type f -name "*.tar.gz"`; do
   tar --keep-newer-files -xvf ${filepath}