From cf8c655361ffed1b255acbf2550064900f28c7e7 Mon Sep 17 00:00:00 2001
From: Tim <tim@susa.pw>
Date: Thu, 16 Feb 2023 15:20:13 +0100
Subject: [PATCH] =?UTF-8?q?mp4-merge=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 aliases.ps1 |  4 ++++
 config.ps1  | 14 ++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/aliases.ps1 b/aliases.ps1
index 0bea73f..52792c1 100644
--- a/aliases.ps1
+++ b/aliases.ps1
@@ -11,6 +11,10 @@ function space {
 function ymp3 {
     yt-dlp --extract-audio --audio-format mp3 --format "bestaudio" -ffmpeg-location "C:\Program Files\ffmpeg\ffmpeg.exe"
 }
+
+function mp4merge {
+    mp4merge.exe
+}
 # Update
 function update {
     Start-Process "C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe" -Verb RunAs -ArgumentList "-command allupdates  | Out-Host" -Wait -WindowStyle Normal    
diff --git a/config.ps1 b/config.ps1
index 091ea77..b61c152 100644
--- a/config.ps1
+++ b/config.ps1
@@ -10,7 +10,7 @@ $toRemove = @('Clipchamp.Clipchamp_yxz26nhyzhsrt', 'Microsoft.549981C3F5F10_8wek
 
 $toInstall = @('7zip.7zip', 'VideoLAN.VLC', 'SumatraPDF.SumatraPDF', 'Microsoft.VisualStudioCode', 'Bitwarden.Bitwarden', 'Mozilla.Firefox', 'IrfanSkiljan.IrfanView', 'Microsoft.PowerToys',
     'Joplin.Joplin', 'WireGuard.WireGuard', 'Devolutions.RemoteDesktopManager', 'TeamViewer.TeamViewer', 'NickeManarin.ScreenToGif', 'JanDeDobbeleer.OhMyPosh', 'WiresharkFoundation.Wireshark', 'Famatech.AdvancedIPScanner',
-    'yt-dlp.yt-dlp'.'Audacity.Audacity', 'ffmpeg')    
+    'yt-dlp.yt-dlp'.'Audacity.Audacity', 'ffmpeg', 'mp4-merge')    
 
 $toInstallOpt = @('Element.Element', 'Discord.Discord', 'Corsair.iCUE.4', 'Valve.Steam', 'GOG.Galaxy', 'TeXstudio.TeXstudio', 'MiKTeX.MiKTeX', 'Citrix.Workspace', 'Nvidia.GeForceExperience', 'Mojang.MinecraftLauncher',
     'Elgato.StreamDeck', 'REALiX.HWiNFO', '9P4CLT2RJ1RS', 'Microsoft.SQLServerManagementStudio', 'Soundboard', 'VMware.WorkstationPro', 'OBSProject.OBSStudio', 'Microsoft.Teams')    
@@ -97,7 +97,17 @@ function InstallSoftware {
                     }
                     catch {
                         Write-Host "Es ist ein Fehler bei der Installation von ffmpeg auftreten. Bitte das Log durchsuchen." -ForegroundColor Red
-                    }                             
+                    } 
+                elseif ($utility -eq 'mp4-merge'){
+                    Write-Host "Installiere mp4-merge..." -ForegroundColor Blue
+                    try {
+                        curl.exe -L https://github.com/gyroflow/mp4-merge/releases/download/v0.1.4/mp4_merge-windows64.exe -o C:\Windows\mp4merge.exe
+                        Write-Host "ffmpeg wurde erfolgreich installiert." -ForegroundColor Green
+                    }
+                    catch {
+                        Write-Host "Es ist ein Fehler bei der Installation von mp4-merge auftreten. Bitte das Log durchsuchen." -ForegroundColor Red
+                    }
+                }                            
                 }
             }
             Catch {