improve consistency

This commit is contained in:
David Refoua
2025-11-06 18:47:25 +03:30
committed by GitHub
parent 375f63ac7e
commit 76711b43b4
2 changed files with 16 additions and 16 deletions

View File

@@ -55,7 +55,7 @@ Param(
# Using this option will skip all downloads, if you only need to build launcher # Using this option will skip all downloads, if you only need to build launcher
[switch]$noVendor, [switch]$noVendor,
# Using this option will specify the emulator to use [none, all, conemu-maximus5, or windows-terminal] # Using this option will specify the emulator to use [none, all, conemu-maximus5, or windows-terminal]
[string]$terminal = 'all', [string]$terminal = 'all',
@@ -139,13 +139,13 @@ if (-not $noVendor) {
foreach ($s in $sources) { foreach ($s in $sources) {
if ($terminal -eq "none") { if ($terminal -eq "none") {
return continue
} elseif ($s.name -eq "conemu-maximus5" -and $terminal -eq "windows-terminal") { } elseif ($s.name -eq "conemu-maximus5" -and $terminal -eq "windows-terminal") {
return continue
} elseif ($s.name -eq "windows-terminal" -and $terminal -eq "conemu-maximus5") { } elseif ($s.name -eq "windows-terminal" -and $terminal -eq "conemu-maximus5") {
return continue
} }
Write-Verbose "Getting vendored $($s.name) $($s.version)..." Write-Verbose "Getting vendored $($s.name) $($s.version)..."
# We do not care about the extensions/type of archive # We do not care about the extensions/type of archive
@@ -158,12 +158,12 @@ if (-not $noVendor) {
# Make Embedded Windows Terminal Portable # Make Embedded Windows Terminal Portable
if ($s.name -eq "windows-terminal") { if ($s.name -eq "windows-terminal") {
$windowTerminalFiles = resolve-path ($saveTo + "\" + $s.name + "\terminal*") $windowTerminalFiles = resolve-path ($saveTo + "\" + $s.name + "\terminal*")
move-item -ErrorAction SilentlyContinue $windowTerminalFiles\* $s.name >$null Move-Item -ErrorAction SilentlyContinue $windowTerminalFiles\* $s.name >$null
remove-item -ErrorAction SilentlyContinue $windowTerminalFiles >$null Remove-Item -ErrorAction SilentlyContinue $windowTerminalFiles >$null
write-verbose "Making Windows Terminal Portable..." Write-Verbose "Making Windows Terminal Portable..."
New-Item -Type Directory -Path (Join-Path $saveTo "/windows-terminal/settings") -ErrorAction SilentlyContinue >$null 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 New-Item -Type File -Path (Join-Path $saveTo "/windows-terminal/.portable") -ErrorAction SilentlyContinue >$null
} }
if ((Get-ChildItem $s.name).Count -eq 1) { if ((Get-ChildItem $s.name).Count -eq 1) {

10
vendor/sources.json vendored
View File

@@ -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", "name": "git-for-windows",
"version": "2.49.0.windows.1", "version": "2.49.0.windows.1",
@@ -19,6 +14,11 @@
"version": "23.07.24", "version": "23.07.24",
"url": "https://github.com/Maximus5/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z" "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", "name": "clink-completions",
"version": "0.6.2", "version": "0.6.2",