From f00cfb7b3ff57ced6182784d59982f180e798d53 Mon Sep 17 00:00:00 2001
From: mazmazz <mar.marcoz@outlook.com>
Date: Mon, 31 Dec 2018 17:31:25 -0500
Subject: [PATCH] Use optional asset archive instead of file

---
 appveyor.yml                   | 2 +-
 deployer/appveyor/deployer.bat | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index be8f47d2..0450b059 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -37,7 +37,7 @@ environment:
  ASSET_ARCHIVE_PATCH_PATH: https://github.com/mazmazz/SRB2/releases/download/SRB2_assets/SRB2-v2122-patch-assets.7z
  ASSET_ARCHIVE_X86_PATH: https://github.com/mazmazz/SRB2/releases/download/SRB2_assets/SRB2-v2122-x86-assets.7z
  ASSET_ARCHIVE_X64_PATH: https://github.com/mazmazz/SRB2/releases/download/SRB2_assets/SRB2-v2122-x64-assets.7z
- ASSET_FILES_OPTIONAL_PATH: https://github.com/mazmazz/SRB2/releases/download/SRB2_assets/music.dta
+ ASSET_ARCHIVE_OPTIONAL_PATH: https://github.com/mazmazz/SRB2/releases/download/SRB2_assets/SRB2-v2122-optional-assets.7z
  # This is overridden to 1 for release tag builds
  ASSET_FILES_OPTIONAL_GET: 0
  # For patches, also include the X86/X64 DLLs.
diff --git a/deployer/appveyor/deployer.bat b/deployer/appveyor/deployer.bat
index 86aa8b3e..7b1bc68a 100644
--- a/deployer/appveyor/deployer.bat
+++ b/deployer/appveyor/deployer.bat
@@ -102,10 +102,10 @@ if [%X86_64%] == [1] (
 )
 
 if [%ASSET_FILES_OPTIONAL_GET%] == [1] (
-    set "archivepath=%ASSET_FILES_OPTIONAL_PATH%"
+    set "archivepath=%ASSET_ARCHIVE_OPTIONAL_PATH%"
     call :ARCHIVE_NAME_PARTS
-    set "ASSET_FILES_OPTIONAL_PATH_LOCAL=!localarchivepath!"
-    if not exist "!localarchivepath!" appveyor DownloadFile "%ASSET_FILES_OPTIONAL_PATH%" -FileName "!localarchivepath!"
+    set "ASSET_ARCHIVE_OPTIONAL_PATH_LOCAL=!localarchivepath!"
+    if not exist "!localarchivepath!" appveyor DownloadFile "%ASSET_ARCHIVE_OPTIONAL_PATH%" -FileName "!localarchivepath!"
 )
 
 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
@@ -120,7 +120,7 @@ mkdir "assets\deployer\patch"
 
 : Copy optional files to full installer (music.dta)
 if [%ASSET_FILES_OPTIONAL_GET%] == [1] (
-    xcopy /I /Y "%ASSET_FILES_OPTIONAL_PATH_LOCAL%" "assets\deployer\installer"
+    7z x -y "%ASSET_ARCHIVE_OPTIONAL_PATH_LOCAL%" -o"assets\deployer\installer" >null
 )
 
 : Copy EXE -- BUILD_PATH is from appveyor.yml