From d3ef6ef16c72a739645bfe5db12dfab3af49854b Mon Sep 17 00:00:00 2001
From: Andrew Kahr <22359829+AndrewKahr@users.noreply.github.com>
Date: Sun, 29 Oct 2023 01:45:18 -0700
Subject: [PATCH] Fix Unity pathing and cleanup scripts

---
 dist/index.js.map                         | Bin 14641999 -> 14642005 bytes
 dist/platforms/windows/activate.ps1       |  12 ++++++------
 dist/platforms/windows/build.ps1          |   2 +-
 dist/platforms/windows/return_license.ps1 |  12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/dist/index.js.map b/dist/index.js.map
index 680481bc5db106430c89d95c1ad7fdfc138d1e07..560e37b10d6f371a30a8652b38349fdcc6803601 100644
GIT binary patch
delta 863
zcmWmAV|Nx{007XlY`fN*?OL|AY}>Z^WOH%Vvb9>~a?36Ey&usz-9FquaNnl>&G4CJ
zAu6N^X+ye@K4b_PL#B{9WC>YAwvavK2suNpkUQiFc|*RCKNJWBL!nSO6bVH`u@D`K
zCq@P*$0clyjwCHej!erGH6!lN>qu<Wj5RSS5lT>!Qk13)WhqB_Do~M1RHh15sYZ2b
zP?K8JrVcUGr5^QZKtmeQm?ku(8O>=yOIp#IHngQ3?dd>AI?<U}y3mzwbf*VB=|yk)
z(3gJnX8;2k#9)Rnlwk~K1S1*6XvQ#>ag1jI6Pd(hrZAOhOy~dSOlC2gIm~4q^I5<`
z7O|KmEM*zXS;0yIt60q%*0PTEY+xgs*vuBTvW@NRU?;oSO&ojJ%RcsVfP=(yh{GHq
zfukJbI43yCDNb{Svz+5R7r4kJE^~#eByx@GByoeA+~PKOxXV56^MHpu;xWlQ;VI8}
o&I?}hir1v@hPS-qJs<eUCq9$P7rye1@BH8=zmj57eiw=V2X{`V+5i9m

delta 864
zcmWm8Q+E(x007XFZFAYi(z0#0Y%P27tF`Q9+gL4gx#i{h3BB~(Io%%a`%V4yH{%<Y
zhBP5<NEgzF3?XC46f%b_A#2DMvWFZYXUG+Dhdd!~$QSa50-<0i6bgqTp=c-;iiZ-R
zWMV{ga>AoOkp&WR$Jfr16q_6olR4q{tB5XfQ7I9WqBLbFOF7C@fr?b3GF7NbHL6pC
zn$)5;b*M`{>Jv!=8q$cyG$D$nG^05!Xh|zt(}uRRqdgtyNGCe;|J{{tbf*VB=|yk)
z(3gJnX8;2k#9)RH%}|ChoDqy<6r&l#SjI7)2~1=XlbOO)VwlEsW-yak%w`UAna6w<
zu#iQ>vX~_-Wf{v^L0~1Th+{SJtYIzdSkDGFvWd-XVJq9%&JGgT$u4%YhrR4$KL<F-
zAr5ndqa5QnCpgI|PIHE{oZ~zfxX2|gbA?2%a*ZUebAy}Q;x>1<%RTP%fQLLHna4cg
qDbIM$3tsYy6khX&x4h#$ANWWrpZLrdzVeOl{NQI&RLZX+`~LyxWv(^=

diff --git a/dist/platforms/windows/activate.ps1 b/dist/platforms/windows/activate.ps1
index 0022dee3..616bdc46 100644
--- a/dist/platforms/windows/activate.ps1
+++ b/dist/platforms/windows/activate.ps1
@@ -1,7 +1,7 @@
 # Activates Unity
-& "C:\Program Files\Unity\Hub\Editor\$Env:UNITY_VERSION\Editor\Unity.exe" -batchmode -quit -nographics `
-                                                                          -username $Env:UNITY_EMAIL `
-                                                                          -password $Env:UNITY_PASSWORD `
-                                                                          -serial $Env:UNITY_SERIAL `
-                                                                          -projectPath "c:/BlankProject" `
-                                                                          -logfile | Out-Host
+& "$Env:UNITY_PATH\$Env:UNITY_VERSION\Editor\Unity.exe" -batchmode -quit -nographics `
+                                                        -username $Env:UNITY_EMAIL `
+                                                        -password $Env:UNITY_PASSWORD `
+                                                        -serial $Env:UNITY_SERIAL `
+                                                        -projectPath "c:/BlankProject" `
+                                                        -logfile -
diff --git a/dist/platforms/windows/build.ps1 b/dist/platforms/windows/build.ps1
index bbae3d21..9c788cf5 100644
--- a/dist/platforms/windows/build.ps1
+++ b/dist/platforms/windows/build.ps1
@@ -156,7 +156,7 @@ $unityArgs = @(
 # Remove null items as that will fail the Start-Process call
 $unityArgs = $unityArgs | Where-Object { $_ -ne $null }
 
-$process = Start-Process -FilePath "C:\Program Files\Unity\Hub\Editor\$Env:UNITY_VERSION\Editor\Unity.exe" `
+$process = Start-Process -FilePath "$Env:UNITY_PATH\$Env:UNITY_VERSION\Editor\Unity.exe" `
                          -ArgumentList $unityArgs `
                          -PassThru `
                          -NoNewWindow
diff --git a/dist/platforms/windows/return_license.ps1 b/dist/platforms/windows/return_license.ps1
index a60c1a1b..c5551486 100644
--- a/dist/platforms/windows/return_license.ps1
+++ b/dist/platforms/windows/return_license.ps1
@@ -1,7 +1,7 @@
 # Return the active Unity license
-& "C:\Program Files\Unity\Hub\Editor\$Env:UNITY_VERSION\Editor\Unity.exe" -batchmode -quit -nographics `
-                                                                          -username $Env:UNITY_EMAIL `
-                                                                          -password $Env:UNITY_PASSWORD `
-                                                                          -returnlicense `
-                                                                          -projectPath "c:/BlankProject" `
-                                                                          -logfile | Out-Host
+& "$Env:UNITY_PATH\$Env:UNITY_VERSION\Editor\Unity.exe" -batchmode -quit -nographics `
+                                                        -username $Env:UNITY_EMAIL `
+                                                        -password $Env:UNITY_PASSWORD `
+                                                        -returnlicense `
+                                                        -projectPath "c:/BlankProject" `
+                                                        -logfile