From 9077622b7b9ac93b0633b35ffa54e3fa6639a137 Mon Sep 17 00:00:00 2001
From: "J. Fronny" <6260391-JFronny@users.noreply.gitlab.com>
Date: Sat, 20 Jun 2020 13:52:18 +0000
Subject: [PATCH] Update .gitlab-ci.yml

---
 .gitlab-ci.yml | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23f57ca..1c3d500 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,30 +18,23 @@ uptool:
       [System.Environment]::GetEnvironmentVariable("Path","Machine"),
       [System.Environment]::GetEnvironmentVariable("Path","User")
     ) -match '.' -join ';'
-    #python DownloadDataDepsInstall.py
-    #ffmpeg --help
-    #python DownloadData.py
     #Quick hack reimplementing DownloadData because it apparently doesn't want to work
     cd testexetrisathlon
     youtube-dl -x --no-playlist --audio-format mp3 -o Intro.mp3 https://youtu.be/U06jlgpMtQs
     youtube-dl -x --no-playlist --audio-format wav -o st1.wav https://youtu.be/hueJrl83sOQ
     youtube-dl -x --no-playlist --audio-format wav -o st2.wav https://youtu.be/7gSS4h47rLU
     youtube-dl -x --no-playlist --audio-format wav -o st3.wav https://youtu.be/NDjDgvXlfVw
-    ffmpeg -i st1.wav -i st2.wav -i st3.wav -filter_complex '[0:0][1:0][2:0][3:0]concat=n=4:v=0:a=1[out]' -map '[out]' InGame1.wav
-    ffmpeg -y -i InGame1.wav InGame1.mp3
-    #rm st1.wav
-    #rm st2.wav
-    #rm st3.wav
-    #rm InGame1.wav
+    ffmpeg -i st1.wav -i st2.wav -i st3.wav -filter_complex concat=n=3:v=0:a=1 -vn InGame1.mp3
+    rm st1.wav
+    rm st2.wav
+    rm st3.wav
     youtube-dl -x --no-playlist --audio-format wav -o st1.wav https://youtu.be/umEDct4BoGc
     youtube-dl -x --no-playlist --audio-format wav -o st2.wav https://youtu.be/NVpjt9gHlDw
     youtube-dl -x --no-playlist --audio-format wav -o st3.wav https://youtu.be/zgKazTrhXmI
-    ffmpeg -i st1.wav -i st2.wav -i st3.wav -filter_complex '[0:0][1:0][2:0][3:0]concat=n=4:v=0:a=1[out]' -map '[out]' InGame2.wav
-    ffmpeg -y -i InGame2.wav InGame2.mp3
-    #rm st1.wav
-    #rm st2.wav
-    #rm st3.wav
-    #rm InGame2.wav
+    ffmpeg -i st1.wav -i st2.wav -i st3.wav -filter_complex concat=n=3:v=0:a=1 -vn InGame2.mp3
+    rm st1.wav
+    rm st2.wav
+    rm st3.wav
     youtube-dl -x --no-playlist --audio-format mp3 -o GameOver.mp3 https://youtu.be/J_3Zad-e9f4
     cd ..
     #Nothing special after here