diff --git a/scripts/build.ps1 b/scripts/build.ps1 index 9d484d3..813ff6f 100644 --- a/scripts/build.ps1 +++ b/scripts/build.ps1 @@ -55,7 +55,7 @@ Param( # Using this option will skip all downloads, if you only need to build launcher [switch]$noVendor, - + # Using this option will specify the emulator to use [none, all, conemu-maximus5, or windows-terminal] [string]$terminal = 'all', @@ -139,13 +139,13 @@ if (-not $noVendor) { foreach ($s in $sources) { if ($terminal -eq "none") { - return + continue } elseif ($s.name -eq "conemu-maximus5" -and $terminal -eq "windows-terminal") { - return + continue } elseif ($s.name -eq "windows-terminal" -and $terminal -eq "conemu-maximus5") { - return + continue } - + Write-Verbose "Getting vendored $($s.name) $($s.version)..." # We do not care about the extensions/type of archive @@ -158,12 +158,12 @@ if (-not $noVendor) { # Make Embedded Windows Terminal Portable if ($s.name -eq "windows-terminal") { - $windowTerminalFiles = resolve-path ($saveTo + "\" + $s.name + "\terminal*") - move-item -ErrorAction SilentlyContinue $windowTerminalFiles\* $s.name >$null - remove-item -ErrorAction SilentlyContinue $windowTerminalFiles >$null - write-verbose "Making Windows Terminal Portable..." - New-Item -Type Directory -Path (Join-Path $saveTo "/windows-terminal/settings") -ErrorAction SilentlyContinue >$null - New-Item -Type File -Path (Join-Path $saveTo "/windows-terminal/.portable") -ErrorAction SilentlyContinue >$null + $windowTerminalFiles = resolve-path ($saveTo + "\" + $s.name + "\terminal*") + Move-Item -ErrorAction SilentlyContinue $windowTerminalFiles\* $s.name >$null + Remove-Item -ErrorAction SilentlyContinue $windowTerminalFiles >$null + Write-Verbose "Making Windows Terminal Portable..." + New-Item -Type Directory -Path (Join-Path $saveTo "/windows-terminal/settings") -ErrorAction SilentlyContinue >$null + New-Item -Type File -Path (Join-Path $saveTo "/windows-terminal/.portable") -ErrorAction SilentlyContinue >$null } if ((Get-ChildItem $s.name).Count -eq 1) { diff --git a/vendor/sources.json b/vendor/sources.json index dae2c16..7362cc0 100644 --- a/vendor/sources.json +++ b/vendor/sources.json @@ -1,9 +1,4 @@ [ - { - "name": "windows-terminal", - "version": "1.20.11271.0", - "url": "https://github.com/microsoft/terminal/releases/download/v1.20.11271.0/Microsoft.WindowsTerminal_1.20.11271.0_x64.zip" - }, { "name": "git-for-windows", "version": "2.49.0.windows.1", @@ -19,6 +14,11 @@ "version": "23.07.24", "url": "https://github.com/Maximus5/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z" }, + { + "name": "windows-terminal", + "version": "1.20.11271.0", + "url": "https://github.com/microsoft/terminal/releases/download/v1.20.11271.0/Microsoft.WindowsTerminal_1.20.11271.0_x64.zip" + }, { "name": "clink-completions", "version": "0.6.2",