Skip to content

Commit eb01668

Browse files
jwittnerjwittner
committed
Auto formatting
1 parent a84f4ec commit eb01668

File tree

1 file changed

+73
-76
lines changed

1 file changed

+73
-76
lines changed

‎UnitySetup/UnitySetup.psm1

Lines changed: 73 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,14 @@ class UnitySetupInstance {
7373
$this.Components = [UnitySetupComponent]::Windows
7474
$playbackEnginePath = [io.path]::Combine("$Path", "Editor\Data\PlaybackEngines");
7575
@{
76-
[UnitySetupComponent]::Documentation = , [io.path]::Combine("$Path", "Editor\Data\Documentation");
76+
[UnitySetupComponent]::Documentation = , [io.path]::Combine("$Path", "Editor\Data\Documentation");
7777
[UnitySetupComponent]::StandardAssets = , [io.path]::Combine("$Path", "Editor\Standard Assets");
7878
[UnitySetupComponent]::Windows_IL2CPP = , [io.path]::Combine("$playbackEnginePath", "windowsstandalonesupport\Variations\win32_development_il2cpp");
79-
[UnitySetupComponent]::UWP = [io.path]::Combine("$playbackEnginePath", "MetroSupport\Templates\UWP_.NET_D3D"),
79+
[UnitySetupComponent]::UWP = [io.path]::Combine("$playbackEnginePath", "MetroSupport\Templates\UWP_.NET_D3D"),
8080
[io.path]::Combine("$playbackEnginePath", "MetroSupport\Templates\UWP_D3D");
81-
[UnitySetupComponent]::UWP_IL2CPP = , [io.path]::Combine("$playbackEnginePath", "MetroSupport\Templates\UWP_IL2CPP_D3D");
82-
[UnitySetupComponent]::Linux = , [io.path]::Combine("$playbackEnginePath", "LinuxStandaloneSupport");
83-
[UnitySetupComponent]::Mac = , [io.path]::Combine("$playbackEnginePath", "MacStandaloneSupport");
81+
[UnitySetupComponent]::UWP_IL2CPP = , [io.path]::Combine("$playbackEnginePath", "MetroSupport\Templates\UWP_IL2CPP_D3D");
82+
[UnitySetupComponent]::Linux = , [io.path]::Combine("$playbackEnginePath", "LinuxStandaloneSupport");
83+
[UnitySetupComponent]::Mac = , [io.path]::Combine("$playbackEnginePath", "MacStandaloneSupport");
8484
}
8585
}
8686
([OperatingSystem]::Linux) {
@@ -92,10 +92,10 @@ class UnitySetupInstance {
9292
$this.Components = [UnitySetupComponent]::Mac
9393
$playbackEnginePath = [io.path]::Combine("$Path", "PlaybackEngines");
9494
@{
95-
[UnitySetupComponent]::Documentation = , [io.path]::Combine("$Path", "Documentation");
95+
[UnitySetupComponent]::Documentation = , [io.path]::Combine("$Path", "Documentation");
9696
[UnitySetupComponent]::StandardAssets = , [io.path]::Combine("$Path", "Standard Assets");
97-
[UnitySetupComponent]::Windows = , [io.path]::Combine("$playbackEnginePath", "WindowsStandaloneSupport");
98-
[UnitySetupComponent]::Linux = , [io.path]::Combine("$playbackEnginePath", "LinuxStandaloneSupport");
97+
[UnitySetupComponent]::Windows = , [io.path]::Combine("$playbackEnginePath", "WindowsStandaloneSupport");
98+
[UnitySetupComponent]::Linux = , [io.path]::Combine("$playbackEnginePath", "LinuxStandaloneSupport");
9999
}
100100
}
101101
}
@@ -301,18 +301,18 @@ function Find-UnitySetupInstaller {
301301
)
302302

303303
$installerTemplates = @{
304-
[UnitySetupComponent]::UWP = "$targetSupport/UnitySetup-UWP-.NET-Support-for-Editor-$Version.$installerExtension",
305-
"$targetSupport/UnitySetup-Metro-Support-for-Editor-$Version.$installerExtension";
306-
[UnitySetupComponent]::UWP_IL2CPP = , "$targetSupport/UnitySetup-UWP-IL2CPP-Support-for-Editor-$Version.$installerExtension";
307-
[UnitySetupComponent]::Android = , "$targetSupport/UnitySetup-Android-Support-for-Editor-$Version.$installerExtension";
308-
[UnitySetupComponent]::iOS = , "$targetSupport/UnitySetup-iOS-Support-for-Editor-$Version.$installerExtension";
309-
[UnitySetupComponent]::AppleTV = , "$targetSupport/UnitySetup-AppleTV-Support-for-Editor-$Version.$installerExtension";
310-
[UnitySetupComponent]::Facebook = , "$targetSupport/UnitySetup-Facebook-Games-Support-for-Editor-$Version.$installerExtension";
311-
[UnitySetupComponent]::Linux = , "$targetSupport/UnitySetup-Linux-Support-for-Editor-$Version.$installerExtension";
312-
[UnitySetupComponent]::Mac = "$targetSupport/UnitySetup-Mac-Support-for-Editor-$Version.$installerExtension",
304+
[UnitySetupComponent]::UWP = "$targetSupport/UnitySetup-UWP-.NET-Support-for-Editor-$Version.$installerExtension",
305+
"$targetSupport/UnitySetup-Metro-Support-for-Editor-$Version.$installerExtension";
306+
[UnitySetupComponent]::UWP_IL2CPP = , "$targetSupport/UnitySetup-UWP-IL2CPP-Support-for-Editor-$Version.$installerExtension";
307+
[UnitySetupComponent]::Android = , "$targetSupport/UnitySetup-Android-Support-for-Editor-$Version.$installerExtension";
308+
[UnitySetupComponent]::iOS = , "$targetSupport/UnitySetup-iOS-Support-for-Editor-$Version.$installerExtension";
309+
[UnitySetupComponent]::AppleTV = , "$targetSupport/UnitySetup-AppleTV-Support-for-Editor-$Version.$installerExtension";
310+
[UnitySetupComponent]::Facebook = , "$targetSupport/UnitySetup-Facebook-Games-Support-for-Editor-$Version.$installerExtension";
311+
[UnitySetupComponent]::Linux = , "$targetSupport/UnitySetup-Linux-Support-for-Editor-$Version.$installerExtension";
312+
[UnitySetupComponent]::Mac = "$targetSupport/UnitySetup-Mac-Support-for-Editor-$Version.$installerExtension",
313313
"$targetSupport/UnitySetup-Mac-Mono-Support-for-Editor-$Version.$installerExtension";
314-
[UnitySetupComponent]::Vuforia = , "$targetSupport/UnitySetup-Vuforia-AR-Support-for-Editor-$Version.$installerExtension";
315-
[UnitySetupComponent]::WebGL = , "$targetSupport/UnitySetup-WebGL-Support-for-Editor-$Version.$installerExtension";
314+
[UnitySetupComponent]::Vuforia = , "$targetSupport/UnitySetup-Vuforia-AR-Support-for-Editor-$Version.$installerExtension";
315+
[UnitySetupComponent]::WebGL = , "$targetSupport/UnitySetup-WebGL-Support-for-Editor-$Version.$installerExtension";
316316
[UnitySetupComponent]::Windows_IL2CPP = , "$targetSupport/UnitySetup-Windows-IL2CPP-Support-for-Editor-$Version.$installerExtension";
317317
}
318318

@@ -426,10 +426,10 @@ function Find-UnitySetupInstaller {
426426
}
427427
$result = New-Object UnitySetupInstaller -Property @{
428428
'ComponentType' = $_;
429-
'Version' = $Version;
430-
'DownloadUrl' = $endpoint;
431-
'Length' = $installerLength;
432-
'LastModified' = $lastModified;
429+
'Version' = $Version;
430+
'DownloadUrl' = $endpoint;
431+
'Length' = $installerLength;
432+
'LastModified' = $lastModified;
433433
}
434434

435435
break
@@ -532,13 +532,13 @@ function Select-UnitySetupInstaller {
532532
}
533533

534534
filter Format-Bytes {
535-
return "{0:N2} {1}" -f $(
536-
if ($_ -lt 1kb) { $_, 'Bytes' }
537-
elseif ($_ -lt 1mb) { ($_/1kb), 'KB' }
538-
elseif ($_ -lt 1gb) { ($_/1mb), 'MB' }
539-
elseif ($_ -lt 1tb) { ($_/1gb), 'GB' }
540-
elseif ($_ -lt 1pb) { ($_/1tb), 'TB' }
541-
else { ($_/1pb), 'PB' }
535+
return "{0:N2} {1}" -f $(
536+
if ($_ -lt 1kb) { $_, 'Bytes' }
537+
elseif ($_ -lt 1mb) { ($_ / 1kb), 'KB' }
538+
elseif ($_ -lt 1gb) { ($_ / 1mb), 'MB' }
539+
elseif ($_ -lt 1tb) { ($_ / 1gb), 'GB' }
540+
elseif ($_ -lt 1pb) { ($_ / 1tb), 'TB' }
541+
else { ($_ / 1pb), 'PB' }
542542
)
543543
}
544544

@@ -556,13 +556,13 @@ function Format-BitsPerSecond {
556556
}
557557
# Convert from bytes to bits
558558
$Bits = ($Bytes * 8) / $Seconds
559-
return "{0:N2} {1}" -f $(
560-
if ($Bits -lt 1kb) { $Bits, 'Bps' }
561-
elseif ($Bits -lt 1mb) { ($Bits/1kb), 'Kbps' }
562-
elseif ($Bits -lt 1gb) { ($Bits/1mb), 'Mbps' }
563-
elseif ($Bits -lt 1tb) { ($Bits/1gb), 'Gbps' }
564-
elseif ($Bits -lt 1pb) { ($Bits/1tb), 'Tbps' }
565-
else { ($Bits/1pb), 'Pbps' }
559+
return "{0:N2} {1}" -f $(
560+
if ($Bits -lt 1kb) { $Bits, 'Bps' }
561+
elseif ($Bits -lt 1mb) { ($Bits / 1kb), 'Kbps' }
562+
elseif ($Bits -lt 1gb) { ($Bits / 1mb), 'Mbps' }
563+
elseif ($Bits -lt 1tb) { ($Bits / 1gb), 'Gbps' }
564+
elseif ($Bits -lt 1pb) { ($Bits / 1tb), 'Tbps' }
565+
else { ($Bits / 1pb), 'Pbps' }
566566
)
567567
}
568568

@@ -630,7 +630,7 @@ function Request-UnitySetupInstaller {
630630

631631
$resource = New-Object UnitySetupResource -Property @{
632632
'ComponentType' = $_.ComponentType
633-
'Path' = $destination
633+
'Path' = $destination
634634
}
635635
$downloads += , $resource
636636
return
@@ -647,15 +647,15 @@ function Request-UnitySetupInstaller {
647647
++$downloadIndex
648648
$global:downloadData[$installerFileName] = New-Object PSObject -Property @{
649649
installerFileName = $installerFileName
650-
startTime = Get-Date
651-
totalBytes = $_.Length
652-
receivedBytes = 0
653-
isDownloaded = $false
654-
destination = $destination
655-
lastModified = $_.LastModified
656-
componentType = $_.ComponentType
657-
webClient = $webClient
658-
downloadIndex = $downloadIndex
650+
startTime = Get-Date
651+
totalBytes = $_.Length
652+
receivedBytes = 0
653+
isDownloaded = $false
654+
destination = $destination
655+
lastModified = $_.LastModified
656+
componentType = $_.ComponentType
657+
webClient = $webClient
658+
downloadIndex = $downloadIndex
659659
}
660660

661661
# Register to events for showing progress of file download.
@@ -666,8 +666,7 @@ function Request-UnitySetupInstaller {
666666
$global:downloadData[$event.MessageData].isDownloaded = $true
667667
} | Out-Null
668668

669-
try
670-
{
669+
try {
671670
Write-Verbose "Downloading $($_.DownloadUrl) to $destination"
672671
$webClient.DownloadFileAsync($_.DownloadUrl, $destination)
673672
}
@@ -712,7 +711,7 @@ function Request-UnitySetupInstaller {
712711

713712
$resource = New-Object UnitySetupResource -Property @{
714713
'ComponentType' = $data.componentType
715-
'Path' = $data.destination
714+
'Path' = $data.destination
716715
}
717716
$downloads += , $resource
718717
return
@@ -781,10 +780,10 @@ function Install-UnitySetupPackage {
781780
switch ($currentOS) {
782781
([OperatingSystem]::Windows) {
783782
$startProcessArgs = @{
784-
'FilePath' = $Package.Path;
783+
'FilePath' = $Package.Path;
785784
'ArgumentList' = @("/S", "/D=$Destination");
786-
'PassThru' = $true;
787-
'Wait' = $true;
785+
'PassThru' = $true;
786+
'Wait' = $true;
788787
}
789788
}
790789
([OperatingSystem]::Linux) {
@@ -794,10 +793,10 @@ function Install-UnitySetupPackage {
794793
# Note that $Destination has to be a disk path.
795794
# sudo installer -package $Package.Path -target /
796795
$startProcessArgs = @{
797-
'FilePath' = 'sudo';
796+
'FilePath' = 'sudo';
798797
'ArgumentList' = @("installer", "-package", $Package.Path, "-target", $Destination);
799-
'PassThru' = $true;
800-
'Wait' = $true;
798+
'PassThru' = $true;
799+
'Wait' = $true;
801800
}
802801
}
803802
}
@@ -977,8 +976,7 @@ function Install-UnitySetupInstance {
977976
# Move the install from the sparse bundle disk to the install directory.
978977
if ($currentOS -eq [OperatingSystem]::Mac) {
979978
# rsync does not recursively create the directory path.
980-
if (-not (Test-Path $installPath -PathType Container))
981-
{
979+
if (-not (Test-Path $installPath -PathType Container)) {
982980
Write-Verbose "Creating directory $installPath."
983981
New-Item $installPath -ItemType Directory -ErrorAction Stop | Out-Null
984982
}
@@ -1031,10 +1029,10 @@ function Uninstall-UnitySetupInstance {
10311029
}
10321030

10331031
$startProcessArgs = @{
1034-
'FilePath' = $uninstaller;
1035-
'PassThru' = $true;
1036-
'Wait' = $true;
1037-
'ErrorAction' = 'Stop';
1032+
'FilePath' = $uninstaller;
1033+
'PassThru' = $true;
1034+
'Wait' = $true;
1035+
'ErrorAction' = 'Stop';
10381036
'ArgumentList' = @("/S");
10391037
}
10401038

@@ -1178,10 +1176,10 @@ function Get-UnityProjectInstance {
11781176
)
11791177

11801178
$args = @{
1181-
'Path' = $BasePath;
1182-
'Filter' = 'ProjectSettings';
1179+
'Path' = $BasePath;
1180+
'Filter' = 'ProjectSettings';
11831181
'ErrorAction' = 'Ignore';
1184-
'Directory' = $true;
1182+
'Directory' = $true;
11851183
}
11861184

11871185
if ( $Recurse ) {
@@ -1582,7 +1580,7 @@ function Get-IsUnityError {
15821580
function ConvertTo-DateTime {
15831581
param([string] $Text)
15841582

1585-
if( -not $text -or $text.Length -eq 0 ) { [DateTime]::MaxValue }
1583+
if ( -not $text -or $text.Length -eq 0 ) { [DateTime]::MaxValue }
15861584
else { [DateTime]$Text }
15871585
}
15881586

@@ -1594,10 +1592,9 @@ function ConvertTo-DateTime {
15941592
.EXAMPLE
15951593
Get-UnityLicense
15961594
#>
1597-
function Get-UnityLicense
1598-
{
1595+
function Get-UnityLicense {
15991596
[CmdletBinding()]
1600-
[Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingConvertToSecureStringWithPlainText", "", Justification="Used to convert discovered plaintext serials into secure strings.")]
1597+
[Diagnostics.CodeAnalysis.SuppressMessageAttribute("PSAvoidUsingConvertToSecureStringWithPlainText", "", Justification = "Used to convert discovered plaintext serials into secure strings.")]
16011598
param([SecureString]$Serial)
16021599

16031600
$licenseFiles = Get-ChildItem "C:\ProgramData\Unity\Unity_*.ulf" -ErrorAction 'SilentlyContinue'
@@ -1608,18 +1605,18 @@ function Get-UnityLicense
16081605

16091606
# The first four bytes look like a count so skip that to pull out the serial string
16101607
$licenseSerial = [String]::new($devBytes[4..($devBytes.Length - 1)])
1611-
if( $Serial -and [System.Net.NetworkCredential]::new($null, $Serial).Password -ne $licenseSerial ) { continue; }
1608+
if ( $Serial -and [System.Net.NetworkCredential]::new($null, $Serial).Password -ne $licenseSerial ) { continue; }
16121609

16131610
$license = $doc.root.License
16141611
[PSCustomObject]@{
16151612
'LicenseVersion' = $license.LicenseVersion.Value
1616-
'Serial' = ConvertTo-SecureString $licenseSerial -AsPlainText -Force
1617-
'UnityVersion' = [UnityVersion]$license.ClientProvidedVersion.Value
1618-
'DisplaySerial' = $license.SerialMasked.Value
1613+
'Serial' = ConvertTo-SecureString $licenseSerial -AsPlainText -Force
1614+
'UnityVersion' = [UnityVersion]$license.ClientProvidedVersion.Value
1615+
'DisplaySerial' = $license.SerialMasked.Value
16191616
'ActivationDate' = ConvertTo-DateTime $license.InitialActivationDate.Value
1620-
'StartDate' = ConvertTo-DateTime $license.StartDate.Value
1621-
'StopDate' = ConvertTo-DateTime $license.StopDate.Value
1622-
'UpdateDate' = ConvertTo-DateTime $license.UpdateDate.Value
1617+
'StartDate' = ConvertTo-DateTime $license.StartDate.Value
1618+
'StopDate' = ConvertTo-DateTime $license.StopDate.Value
1619+
'UpdateDate' = ConvertTo-DateTime $license.UpdateDate.Value
16231620
}
16241621
}
16251622
}

0 commit comments

Comments
 (0)