Merge pull request #16 from jwittner/dev/missingInstallBugs

Fix a few issues around errors with missing unity installs.

Author: derekfreed

UnitySetup/UnitySetup.psm1

@@ -94,6 +94,9 @@ class UnityVersion
         if($a.Build -lt $b.Build) { return -1 }
         if($a.Build -gt $b.Build) { return 1 }
 
+        if($a.Suffix -lt $b.Suffix) { return -1 }
+        if($a.Suffix -gt $b.Suffix) { return 1 }
+
         return 0
     }
 }
@@ -392,7 +395,7 @@ function Select-UnitySetupInstance
                 } 
             }
         }
-        else { $Instances }
+        elseif( $Instances.Count -gt 0 ) { $Instances }
     }
     end
     {
@@ -494,8 +497,8 @@ function Start-UnityEditor
     [CmdletBinding(DefaultParameterSetName="Context")]
     param(
         [parameter(Mandatory=$false, ValueFromPipeline = $true, ParameterSetName='Projects')]
-        [parameter(Mandatory=$true, ParameterSetName='ProjectsLatest')]
-        [parameter(Mandatory=$true, ParameterSetName='ProjectsVersion')]
+        [parameter(Mandatory=$true, ValueFromPipeline = $true, ParameterSetName='ProjectsLatest')]
+        [parameter(Mandatory=$true, ValueFromPipeline = $true, ParameterSetName='ProjectsVersion')]
         [ValidateNotNullOrEmpty()]
         [UnityProjectInstance[]] $Project,
         [parameter(Mandatory=$false, ValueFromPipeline = $true, ParameterSetName='Setups')]
@@ -545,7 +548,7 @@ function Start-UnityEditor
                 else
                 {
                     $setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Latest
-                    if($null -ne $setupInstance)
+                    if($setupInstance.Count -gt 0)
                     {
                         $setupInstances += ,$setupInstance
                     }
@@ -573,7 +576,7 @@ function Start-UnityEditor
                 elseif( $Latest )
                 {
                     $setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Latest
-                    if($null -ne $setupInstance)
+                    if($setupInstance.Count -gt 0)
                     {
                         $setupInstances = ,$setupInstance
                     }
@@ -591,7 +594,7 @@ function Start-UnityEditor
                 elseif($null -ne $Version)
                 {
                     $setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Version $Version
-                    if($null -ne $setupInstance)
+                    if($setupInstance.Count -gt 0)
                     {
                         $setupInstances = ,$setupInstance
                     }
@@ -609,26 +612,25 @@ function Start-UnityEditor
 
         $instanceArgs = @()
         foreach( $p in $projectInstances ) { 
-            $projectVersion = $p.Version
 
             if( $Latest ) {
                 $setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Latest
-                if($null -eq $setupInstance) {
+                if($setupInstance.Count -eq 0) {
                     Write-Error "Could not find any Unity Editor installed"
                     continue
                 }
             }
             elseif($null -ne $Version) {
                 $setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Version $Version
-                if ($null -eq $setupInstance) {
+                if ($setupInstance.Count -eq 0) {
                     Write-Error "Could not find Unity Editor for version $Version"
                     continue
                 }
             }
             else {   
-                $setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Version $projectVersion
-                if($null -eq $setupInstance) {
-                    Write-Error "Could not find Unity Editor for version $projectVersion"
+                $setupInstance = Get-UnitySetupInstance | Select-UnitySetupInstance -Version $p.Version
+                if($setupInstance.Count -eq 0) {
+                    Write-Error "Could not find Unity Editor for version $($p.Version)"
                     continue
                 }
             }