Skip to content

Commit 6948be7

Browse files
committed
Simplify and clean up Select-UnitySetupInstance
1 parent 8caa03b commit 6948be7

File tree

1 file changed

+12
-36
lines changed

1 file changed

+12
-36
lines changed

UnitySetup/UnitySetup.psm1

Lines changed: 12 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -360,8 +360,6 @@ function Get-UnitySetupInstance
360360
Get-UnitySetupInstance | Select-UnitySetupInstance -Latest
361361
.EXAMPLE
362362
Get-UnitySetupInstance | Select-UnitySetupInstance -Version 2017.1.0f3
363-
.EXAMPLE
364-
Get-UnitySetupInstance | Select-UnitySetupInstance -Project C:\MyUnityProject
365363
#>
366364
function Select-UnitySetupInstance
367365
{
@@ -373,50 +371,28 @@ function Select-UnitySetupInstance
373371
[parameter(Mandatory=$false)]
374372
[UnityVersion] $Version,
375373

376-
[parameter(Mandatory=$false)]
377-
[string] $Project,
378-
379374
[parameter(Mandatory=$true, ValueFromPipeline=$true)]
380-
[UnitySetupInstance[]] $instances
375+
[UnitySetupInstance[]] $Instances
381376
)
382-
383-
begin
384-
{
385-
if( $Project )
386-
{
387-
$Version = Get-UnityProjectInstance -BasePath $Project |
388-
Select-Object -First 1 -ExpandProperty Version
389-
}
390-
}
377+
391378
process
392379
{
393380
if( $Version )
394381
{
395-
$instances = $instances | Where-Object { [UnityVersion]::Compare($_.Version, $Version) -eq 0 }
382+
$Instances = $Instances | Where-Object { [UnityVersion]::Compare($_.Version, $Version) -eq 0 }
396383
}
397384

398-
foreach( $i in $instances )
399-
{
400-
if( $Latest )
401-
{
402-
if( $latestInstance )
403-
{
404-
$iVersion = [UnityVersion]::new($i.Version)
405-
$lVersion = [UnityVersion]::new($latestInstance.Version)
406-
407-
if([UnityVersion]::Compare($iVersion, $lVersion) -lt 0)
408-
{
409-
continue
410-
}
411-
}
412-
413-
$latestInstance = $i
385+
if( $Latest )
386+
{
387+
foreach( $i in $Instances )
388+
{
389+
if( $null -eq $latestInstance -or [UnityVersion]::Compare($i.Version, $latestInstance.Version) -gt 0)
390+
{
391+
$latestInstance = $i
392+
}
414393
}
415-
else
416-
{
417-
$i
418-
}
419394
}
395+
else { $Instances }
420396
}
421397
end
422398
{

0 commit comments

Comments
 (0)