From 5b8da9c186faf866c04ae2f518080d218a26e79a Mon Sep 17 00:00:00 2001 From: Abhinuv Nitin Pitale Date: Mon, 8 Oct 2018 13:49:01 -0700 Subject: [PATCH 1/6] add env variable for installer path for Unity #111 --- UnitySetup/UnitySetup.psm1 | 1 + 1 file changed, 1 insertion(+) diff --git a/UnitySetup/UnitySetup.psm1 b/UnitySetup/UnitySetup.psm1 index 0b16f16..549c551 100644 --- a/UnitySetup/UnitySetup.psm1 +++ b/UnitySetup/UnitySetup.psm1 @@ -492,6 +492,7 @@ function Install-UnitySetupInstance { } } } + [Environment]::SetEnvironmentVariable("UNITY_"+$version, $destPath, "Unity Installer Path") } } From b5b22628bd0c2c7220ef157a6e7048949e472d1c Mon Sep 17 00:00:00 2001 From: Abhinuv Nitin Pitale Date: Mon, 8 Oct 2018 14:30:01 -0700 Subject: [PATCH 2/6] update for adding user env path --- UnitySetup/UnitySetup.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitySetup/UnitySetup.psm1 b/UnitySetup/UnitySetup.psm1 index 549c551..9b2a808 100644 --- a/UnitySetup/UnitySetup.psm1 +++ b/UnitySetup/UnitySetup.psm1 @@ -492,7 +492,7 @@ function Install-UnitySetupInstance { } } } - [Environment]::SetEnvironmentVariable("UNITY_"+$version, $destPath, "Unity Installer Path") + [Environment]::SetEnvironmentVariable("UNITY_"+$version, $destPath, [System.EnvironmentVariableTarget]::User) } } From 57b650bd713abdfa1ab1311f54fb4bb944497797 Mon Sep 17 00:00:00 2001 From: Abhinuv Nitin Pitale Date: Tue, 9 Oct 2018 11:07:02 -0700 Subject: [PATCH 3/6] changed position. Set only if successful --- UnitySetup/UnitySetup.psm1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/UnitySetup/UnitySetup.psm1 b/UnitySetup/UnitySetup.psm1 index 9b2a808..0ec5269 100644 --- a/UnitySetup/UnitySetup.psm1 +++ b/UnitySetup/UnitySetup.psm1 @@ -489,10 +489,10 @@ function Install-UnitySetupInstance { } else { Write-Verbose "$(Get-Date): Succeeded." + [Environment]::SetEnvironmentVariable("UNITY_"+$version, $destPath, [System.EnvironmentVariableTarget]::User) } } - } - [Environment]::SetEnvironmentVariable("UNITY_"+$version, $destPath, [System.EnvironmentVariableTarget]::User) + } } } From 325a245fa714a24b985452de4a611f79d6e9057c Mon Sep 17 00:00:00 2001 From: Abhinuv Nitin Pitale Date: Tue, 9 Oct 2018 16:41:39 -0700 Subject: [PATCH 4/6] changed `$version` --- UnitySetup/UnitySetup.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitySetup/UnitySetup.psm1 b/UnitySetup/UnitySetup.psm1 index 0ec5269..d5a8d74 100644 --- a/UnitySetup/UnitySetup.psm1 +++ b/UnitySetup/UnitySetup.psm1 @@ -489,7 +489,7 @@ function Install-UnitySetupInstance { } else { Write-Verbose "$(Get-Date): Succeeded." - [Environment]::SetEnvironmentVariable("UNITY_"+$version, $destPath, [System.EnvironmentVariableTarget]::User) + [Environment]::SetEnvironmentVariable("UNITY_$($version)", $destPath, [System.EnvironmentVariableTarget]::User) } } } From 164441f1a1fd878f0d6c10dc79ed0d6a07b69da9 Mon Sep 17 00:00:00 2001 From: Abhinuv Nitin Pitale Date: Wed, 10 Oct 2018 20:22:54 -0700 Subject: [PATCH 5/6] changed `$version` and `$destPath` --- UnitySetup/UnitySetup.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnitySetup/UnitySetup.psm1 b/UnitySetup/UnitySetup.psm1 index d5a8d74..0ee31af 100644 --- a/UnitySetup/UnitySetup.psm1 +++ b/UnitySetup/UnitySetup.psm1 @@ -489,7 +489,7 @@ function Install-UnitySetupInstance { } else { Write-Verbose "$(Get-Date): Succeeded." - [Environment]::SetEnvironmentVariable("UNITY_$($version)", $destPath, [System.EnvironmentVariableTarget]::User) + [Environment]::SetEnvironmentVariable("UNITY_$($i.Version)", $Destination, [System.EnvironmentVariableTarget]::User) } } } From 470c236e5f238056cc1c2cf18fd140ab299f2394 Mon Sep 17 00:00:00 2001 From: Abhinuv Nitin Pitale Date: Fri, 12 Oct 2018 18:52:22 -0700 Subject: [PATCH 6/6] cached localVersion, added to update --- UnitySetup/UnitySetup.psm1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/UnitySetup/UnitySetup.psm1 b/UnitySetup/UnitySetup.psm1 index 0ee31af..fa79696 100644 --- a/UnitySetup/UnitySetup.psm1 +++ b/UnitySetup/UnitySetup.psm1 @@ -437,7 +437,7 @@ function Install-UnitySetupInstance { foreach ( $i in $Installers) { $fileName = [io.Path]::GetFileName($i.DownloadUrl) $destPath = [io.Path]::Combine($Cache, "Installers\Unity-$($i.Version)\$fileName") - + $localVersion = $i.Version $localInstallers += , $destPath if ($Destination) { $localDestinations += , $Destination @@ -489,10 +489,10 @@ function Install-UnitySetupInstance { } else { Write-Verbose "$(Get-Date): Succeeded." - [Environment]::SetEnvironmentVariable("UNITY_$($i.Version)", $Destination, [System.EnvironmentVariableTarget]::User) + [Environment]::SetEnvironmentVariable("UNITY_$($localVersion)", $Destination, [System.EnvironmentVariableTarget]::User) } } - } + } } }