Skip to content

Commit 76711b4

Browse files
authored
improve consistency
1 parent 375f63a commit 76711b4

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

scripts/build.ps1

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ Param(
5555

5656
# Using this option will skip all downloads, if you only need to build launcher
5757
[switch]$noVendor,
58-
58+
5959
# Using this option will specify the emulator to use [none, all, conemu-maximus5, or windows-terminal]
6060
[string]$terminal = 'all',
6161

@@ -139,13 +139,13 @@ if (-not $noVendor) {
139139

140140
foreach ($s in $sources) {
141141
if ($terminal -eq "none") {
142-
return
142+
continue
143143
} elseif ($s.name -eq "conemu-maximus5" -and $terminal -eq "windows-terminal") {
144-
return
144+
continue
145145
} elseif ($s.name -eq "windows-terminal" -and $terminal -eq "conemu-maximus5") {
146-
return
146+
continue
147147
}
148-
148+
149149
Write-Verbose "Getting vendored $($s.name) $($s.version)..."
150150

151151
# We do not care about the extensions/type of archive
@@ -158,12 +158,12 @@ if (-not $noVendor) {
158158

159159
# Make Embedded Windows Terminal Portable
160160
if ($s.name -eq "windows-terminal") {
161-
$windowTerminalFiles = resolve-path ($saveTo + "\" + $s.name + "\terminal*")
162-
move-item -ErrorAction SilentlyContinue $windowTerminalFiles\* $s.name >$null
163-
remove-item -ErrorAction SilentlyContinue $windowTerminalFiles >$null
164-
write-verbose "Making Windows Terminal Portable..."
165-
New-Item -Type Directory -Path (Join-Path $saveTo "/windows-terminal/settings") -ErrorAction SilentlyContinue >$null
166-
New-Item -Type File -Path (Join-Path $saveTo "/windows-terminal/.portable") -ErrorAction SilentlyContinue >$null
161+
$windowTerminalFiles = resolve-path ($saveTo + "\" + $s.name + "\terminal*")
162+
Move-Item -ErrorAction SilentlyContinue $windowTerminalFiles\* $s.name >$null
163+
Remove-Item -ErrorAction SilentlyContinue $windowTerminalFiles >$null
164+
Write-Verbose "Making Windows Terminal Portable..."
165+
New-Item -Type Directory -Path (Join-Path $saveTo "/windows-terminal/settings") -ErrorAction SilentlyContinue >$null
166+
New-Item -Type File -Path (Join-Path $saveTo "/windows-terminal/.portable") -ErrorAction SilentlyContinue >$null
167167
}
168168

169169
if ((Get-ChildItem $s.name).Count -eq 1) {

vendor/sources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,4 @@
11
[
2-
{
3-
"name": "windows-terminal",
4-
"version": "1.20.11271.0",
5-
"url": "https://github.com/microsoft/terminal/releases/download/v1.20.11271.0/Microsoft.WindowsTerminal_1.20.11271.0_x64.zip"
6-
},
72
{
83
"name": "git-for-windows",
94
"version": "2.49.0.windows.1",
@@ -19,6 +14,11 @@
1914
"version": "23.07.24",
2015
"url": "https://github.com/Maximus5/ConEmu/releases/download/v23.07.24/ConEmuPack.230724.7z"
2116
},
17+
{
18+
"name": "windows-terminal",
19+
"version": "1.20.11271.0",
20+
"url": "https://github.com/microsoft/terminal/releases/download/v1.20.11271.0/Microsoft.WindowsTerminal_1.20.11271.0_x64.zip"
21+
},
2222
{
2323
"name": "clink-completions",
2424
"version": "0.6.2",

0 commit comments

Comments
 (0)