Skip to content

updated default installation path to be the hub path #136

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
merged 2 commits into from
Jan 16, 2019
Merged

updated default installation path to be the hub path #136

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07e595e
updated default installation path to be the hub path
StephenHodgson Jan 9, 2019
0842ca8
Merge branch 'develop' into dev-hub-default-install-path
StephenHodgson Jan 12, 2019
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
14 changes: 12 additions & 2 deletions UnitySetup/UnitySetup.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,17 @@ function Install-UnitySetupInstance {
$localDestinations += , $Destination
}
else {
$localDestinations += , "C:\Program Files\Unity-$($i.Version)"
switch (Get-OperatingSystem) {
([OperatingSystem]::Windows) {
$localDestinations += , "C:\Program Files\Unity\Hub\Editor\$($i.Version)"
}
([OperatingSystem]::Linux) {
throw "Install-UnitySetupInstance has not been implemented on the Linux platform. Contributions welcomed!";
}
([OperatingSystem]::Mac) {
$localDestinations += , "/Applications/Unity/Hub/Editor/$($i.Version)"
}
}
}

if ( Test-Path $destPath ) {
Expand Down Expand Up @@ -617,7 +627,7 @@ function Get-UnitySetupInstance {
}
([OperatingSystem]::Mac) {
if (-not $BasePath) {
$BasePath = @('/Applications/Unity*')
$BasePath = @('/Applications/Unity*', '/Applications/Unity/Hub/Editor/*')
}
$ivyPath = 'Unity.app/Contents/UnityExtensions/Unity/Networking/ivy.xml'
}
Expand Down