Skip to content

Clean up editor search and fix recent issues #177

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Derek (derekfreed) merged 1 commit into from
May 1, 2019
Merged

Clean up editor search and fix recent issues #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions UnitySetup/UnitySetup.psd1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@
'Install-UnitySetupInstance',
'Select-UnitySetupInstance',
'Uninstall-UnitySetupInstance',
'Get-UnityEditor',
'Start-UnityEditor',
'ConvertTo-UnitySetupComponent',
'Get-UnityLicense'
Expand All @@ -100,6 +101,7 @@
'gusi',
'gupi',
'susi',
'gue',
'sue'
)

Expand Down
84 changes: 59 additions & 25 deletions UnitySetup/UnitySetup.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,56 @@ function Get-OperatingSystem {
}
}

<#
.Synopsis
Get the Unity Editor application
.PARAMETER Path
Path of a UnitySetupInstance
.EXAMPLE
Get-UnityEditor -Path $unitySetupInstance.Path
#>
function Get-UnityEditor {
[CmdletBinding()]
param(
[ValidateScript( {Test-Path $_ -PathType Container} )]
[Parameter(Mandatory = $false, ValueFromPipeline = $true, Position = 0, ParameterSetName = "Path")]
[string[]]$Path = $PWD,

[Parameter(Mandatory = $true, ValueFromPipeline = $true, Position = 0, ParameterSetName = "Instance")]
[ValidateNotNull()]
[UnitySetupInstance[]]$Instance
)

process {

if ( $PSCmdlet.ParameterSetName -eq "Instance" ) {
$Path = $Instance.Path
}

$currentOS = Get-OperatingSystem
foreach ($p in $Path) {
switch ($currentOS) {
([OperatingSystem]::Windows) {
$editor = Get-ChildItem "$p" -Filter 'Unity.exe' -Recurse |
Select-Object -First 1 -ExpandProperty FullName

Write-Output $editor
}
([OperatingSystem]::Linux) {
throw "Get-UnityEditor has not been implemented on the Linux platform. Contributions welcomed!";
}
([OperatingSystem]::Mac) {
$editor = Join-Path "$p" "Unity.app/Contents/MacOS/Unity"

if (Test-Path $editor) {
Write-Output (Resolve-Path $editor).Path
}
}
}
}
}
}

<#
.Synopsis
Help to create UnitySetupComponent
Expand Down Expand Up @@ -1088,9 +1138,10 @@ function Get-UnitySetupInstance {
}
}

Get-ChildItem $BasePath -Directory | Where-Object {
Test-Path (Join-Path $_.FullName 'Editor\Unity.exe') -PathType Leaf
} | ForEach-Object {

$BasePath | Where-Object { Test-Path $_ -PathType Container } |
Get-ChildItem -Directory | Where-Object { (Get-UnityEditor $_.FullName).Count -gt 0 } |
ForEach-Object {
$path = $_.FullName
try {
Write-Verbose "Creating UnitySetupInstance for $path"
Expand Down Expand Up @@ -1528,32 +1579,14 @@ function Start-UnityEditor {
$setupInstances += , $setupInstance
}

$currentOS = Get-OperatingSystem

for ($i = 0; $i -lt $setupInstances.Length; $i++) {
$setupInstance = $setupInstances[$i]

switch ($currentOS) {
([OperatingSystem]::Windows) {
$editor = Get-ChildItem "$($setupInstance.Path)" -Filter 'Unity.exe' -Recurse |
Select-Object -First 1 -ExpandProperty FullName

if ([string]::IsNullOrEmpty($editor)) {
Write-Error "Could not find Unity.exe under setup instance path: $($setupInstance.Path)"
continue
}
}
([OperatingSystem]::Linux) {
throw "Start-UnityEditor has not been implemented on the Linux platform. Contributions welcomed!";
}
([OperatingSystem]::Mac) {
$editor = [io.path]::Combine("$($setupInstance.Path)", "Unity.app/Contents/MacOS/Unity")

if ([string]::IsNullOrEmpty($editor)) {
Write-Error "Could not find Unity app under setup instance path: $($setupInstance.Path)"
continue
}
}
$editor = Get-UnityEditor "$($setupInstance.Path)"
if ( -not $editor ) {
Write-Error "Could not find Unity Editor under setup instance path: $($setupInstance.Path)"
continue
}

# clone the shared args list
Expand Down Expand Up @@ -1695,6 +1728,7 @@ function Get-UnityLicense {
@{ 'Name' = 'gusi'; 'Value' = 'Get-UnitySetupInstance' },
@{ 'Name' = 'gupi'; 'Value' = 'Get-UnityProjectInstance' },
@{ 'Name' = 'susi'; 'Value' = 'Select-UnitySetupInstance' },
@{ 'Name' = 'gue'; 'Value' = 'Get-UnityEditor' }
@{ 'Name' = 'sue'; 'Value' = 'Start-UnityEditor' }
) | ForEach-Object {

Expand Down