Car settings update from Jim Piavis

kju512 · Mar 22, 2018 · 3e62641 · 3e62641
1 parent 931ffd4
commit 3e62641
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/build.cmd b/build.cmd
@@ -75,7 +75,7 @@ robocopy /MIR external\rpclib\rpclib-2.2.1\build\Release %RPCLIB_TARGET_LIB%\Rel
 
 REM //---------- get High PolyCount SUV Car Model ------------
 IF NOT EXIST Unreal\Plugins\AirSim\Content\VehicleAdv mkdir Unreal\Plugins\AirSim\Content\VehicleAdv
-IF NOT EXIST Unreal\Plugins\AirSim\Content\VehicleAdv\SUV\v1.1.7 (
+IF NOT EXIST Unreal\Plugins\AirSim\Content\VehicleAdv\SUV\v1.1.9 (
     IF NOT DEFINED noFullPolyCar (
         REM //leave some blank lines because powershell shows download banner at top of console
         ECHO(   
@@ -89,9 +89,9 @@ IF NOT EXIST Unreal\Plugins\AirSim\Content\VehicleAdv\SUV\v1.1.7 (
         IF EXIST suv_download_tmp rmdir suv_download_tmp /q /s
         mkdir suv_download_tmp
         @echo on
-        REM powershell -command "& { Start-BitsTransfer -Source https://github.com/Microsoft/AirSim/releases/download/v1.1.7/car_assets.zip -Destination suv_download_tmp\car_assets.zip }"
-        REM powershell -command "& { (New-Object System.Net.WebClient).DownloadFile('https://github.com/Microsoft/AirSim/releases/download/v1.1.7/car_assets.zip', 'suv_download_tmp\car_assets.zip') }"
-        powershell -command "& { [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; iwr https://github.com/Microsoft/AirSim/releases/download/v1.1.7/car_assets.zip -OutFile suv_download_tmp\car_assets.zip }"
+        REM powershell -command "& { Start-BitsTransfer -Source https://github.com/Microsoft/AirSim/releases/download/v1.1.9/car_assets.zip -Destination suv_download_tmp\car_assets.zip }"
+        REM powershell -command "& { (New-Object System.Net.WebClient).DownloadFile('https://github.com/Microsoft/AirSim/releases/download/v1.1.9/car_assets.zip', 'suv_download_tmp\car_assets.zip') }"
+        powershell -command "& { [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; iwr https://github.com/Microsoft/AirSim/releases/download/v1.1.9/car_assets.zip -OutFile suv_download_tmp\car_assets.zip }"
         @echo off
 		rmdir /S /Q Unreal\Plugins\AirSim\Content\VehicleAdv\SUV
         powershell -command "& { Expand-Archive -Path suv_download_tmp\car_assets.zip -DestinationPath Unreal\Plugins\AirSim\Content\VehicleAdv }"

diff --git a/setup.sh b/setup.sh
@@ -86,7 +86,7 @@ fi
 if [ ! -d "Unreal/Plugins/AirSim/Content/VehicleAdv" ]; then
     mkdir -p "Unreal/Plugins/AirSim/Content/VehicleAdv"
 fi
-if [ ! -d "Unreal/Plugins/AirSim/Content/VehicleAdv/SUV/v1.1.7" ]; then
+if [ ! -d "Unreal/Plugins/AirSim/Content/VehicleAdv/SUV/v1.1.9" ]; then
     if $downloadHighPolySuv; then
         echo "*********************************************************************************************"
         echo "Downloading high-poly car assets.... The download is ~37MB and can take some time."
@@ -98,7 +98,10 @@ if [ ! -d "Unreal/Plugins/AirSim/Content/VehicleAdv/SUV/v1.1.7" ]; then
         fi
         mkdir -p "suv_download_tmp"
         cd suv_download_tmp
-        wget  https://github.com/Microsoft/AirSim/releases/download/v1.1.7/car_assets.zip
+        wget  https://github.com/Microsoft/AirSim/releases/download/v1.1.9/car_assets.zip
+        if [ -d "../Unreal/Plugins/AirSim/Content/VehicleAdv/SUV" ]; then
+            rm -rf "../Unreal/Plugins/AirSim/Content/VehicleAdv/SUV"
+        fi        
         unzip car_assets.zip -d ../Unreal/Plugins/AirSim/Content/VehicleAdv
         cd ..
         rm -rf "suv_download_tmp"