From f43335663cf5b4f055be7219636ac7f91ea40dcd Mon Sep 17 00:00:00 2001
From: VioletXF <zudevxf@gmail.com>
Date: Fri, 28 Jul 2023 05:15:13 +0900
Subject: [PATCH] Fix unity path (#552)

* Fix unity path

* Add quotes back
---
 dist/.DS_Store                        | Bin 0 -> 6148 bytes
 dist/index.js                         | Bin 19458247 -> 19458217 bytes
 dist/index.js.map                     | Bin 13744614 -> 13744582 bytes
 src/model/platform-setup/setup-mac.ts |  12 +++++-------
 4 files changed, 5 insertions(+), 7 deletions(-)
 create mode 100644 dist/.DS_Store

diff --git a/dist/.DS_Store b/dist/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..b1ba203a55cb6bc6184784669be92cdecce76f5b
GIT binary patch
literal 6148
zcmeHKJx{|h5IsYN@-b9`fiXK`=muM;!iEr17sk>AN+4+}+73tv<tOk@*jPIA8{i)>
zGqdo{HdRbN)G{Chcar^F=gxWeocJ0dQuRSxBdQWn1&z^LMK{6tI=3-fvNIg4^cq)m
zOxKjtC7q3V%Y-N(3j8(&_}yKnI;C_<9V)-S5%tq{tr6u}*N}dDpXHn7Vc1IZ7JMq(
zcQ5ycdr$kb{o{rFyB8%cOHC|In-t@mIS2Cr`1fgtS{Nl5#~Al0!daA1_e&n?akxmV
zlh?4eab)tE``%ez%JUoXPTpR?d9NTR-mgA#&yizBJ$I*)=gD5>Ty9TZKlf<DdS%wL
zJsp0EA16Fd13XI!_}yS1B5>@0X+mw6B|XgYEpy#XM_i|_U1mIwzr$PCKc@b#3^kjr
zvSv_vQ9u+B1x5<+`QW251{Mp0`shHXKLLOqrnO<LYXH#a31DEcFo+qLGNC{ds_Z9*
zvPZEp;kX`H|H7aNC#CO<b?lv${X#Jn2=l&nClwf!UK9`oTm_cR&nnmdgX!P@Zjk&E
z1w?^ArGWCnMp#EmwziHX$F<f+Yof8SUtv&(ptI#z54aR>p=rZ4p9jFeVqp+7F!>{(
MWspu3_)!Hu086#C-~a#s

literal 0
HcmV?d00001

diff --git a/dist/index.js b/dist/index.js
index bad063c0274abd0fcd3323bd44b1c230eed67955..e8466aa16cd976d121d9cba1490007aaa20568c6 100644
GIT binary patch
delta 1348
zcmYk+XIPG57>DtrdfGdUH;H;HZ%Acluk0B@MkGl_UMV|5gzV8{kFv5yWJe^MWE0tY
z@9n%k@!@yg$8jD1&v$-7hIuBEk`0m#lZ~>J;9NDlP_Z!821NUL=yYn}4MUAuoU1sg
z`dlT<-ajr%KPVzH$~WNuK{kUBJ2kOTNmm2dX8T`O^2}_tp|LUXqdb}?^zo0->$Pb`
zN^8r1H?5i!q-fN@2a0h@T#*8KO<)Q$n8N~=u!1#gU<*6g!vQ7W2q!qh1sb@bB-~I6
z?kJ5i@PH?@@PapdP!>A)q8!Sj0{l=B{s=%IDxor}pem}NI%*&YHBk$-Q3rKV5B1Ri
z4bcdV5sW5iie_kz7HEl9XpJ^#i*{&_5OhFCbV4XPqYJts4BgNjJ<t>3=!M>hKp#Y+
zFQU*7(ddsD48TAP!eGQ=2=o|=I1EEP5-=PiFcPCM8e=dPi5Q3RNWuh6#3UqRGNvE}
zQ!x$Gk%}3ZiCLJ9Ihc!in2!Zmh%~5JgvD5brC5gLSb>#Th1Ez$2G(FL)?qz1AQKz0
z37fG6Td@t>u>(7?3t8BWJ;=sh?8AN>z(E|sVdUTljv^Pwa2$C!fqb0ADV)X`oW(hu
z#|2zO0WP5smvIGGaShjT12=ICw^4*UxQk-k!+ku!Lp;J`Ji${u!*jgAOT5Bsyun+%
z!+U(dM|{F(e8E?I!*~3^PyE7f{7H=~GMEjCp~Og{NQ@;W5>ttp#9U$_v6NUztR*%Q
zTZx^-Ug97rA#s#ANt`7v5{<-FQc~h3DJ5~2l$Ml{ct|`YT8Wp$TjC=rE72L`@J$$m
GTK)y>s?F&D

delta 1362
zcmY+^cT~+`7{Kv!>({O8wue-zn<$a8_ue~uW>l_Z<f6z9krCO~URl{Avg3xVkg{d(
zy|?&2=Qz&s$LD*_`<&-If4-?XDVi+AC#Vw463o+-h9;xFz{<gxoaCW44l*gx|36*Q
z-7=M$_VZSJRy*p4MT8mjeHz8-Bie+;^wZVS8G}uVw^kP%8L0CQ4b}Mv7+d5jTP*)B
zrYm_$wv|oC=%|>Hx~8$=L16}i@$N09rRLwr7++N>k{FV&zyfMm!U`G`f)>`Wfi3J{
z4+l8H3C?gqVYotWy1^YDC<;$_!5cdGpcs5n93|iff0RT3N})6YQ3gQ>Mp=|Yc~n3}
zR6=D`K~+>kb<{vj)Ix34L0!~CeKbHrG(uxEK~pqCbF@H9v_flypbgrh9onM<I-(Og
zqYJvC8@eMDJ<t=q&>LY0M+EvnkG_aRKSZHF24EltAsT~Wzz__@FvK7h!!ZJJ7>Q9B
zjWHODaTt$yOu$4;LINgZ3KB6D(=Z(~kc63-g=Eae9L&W$%*O&Ogb|Cd7)!7e%di|P
zuoA1V8f%b(wOEJs*no{l#U^aV7Hq{fY{w4l#4hYc8unl>(y<TwaR3K#2#0Y5890h#
zFd-AiaRMiig;O|<GdPQL$i{hGz(wTX5^|A;%eaE8xQ6Svft$F6eB8zz+{HcI#{)dX
zBRs|vJjF9S#|yl~E4;=Vyu~}b#|M1GCw#^ie8o3>#}E9(FBIVSjF5a)G9+dabBQ9c
zkf<e=5-W*DQb?keSW9dqwh}vuy~IJ{C~=ZFOI##{C9aYp5;uvv#6wb4;wkZxcuRB=
YA4xHZucWx7gv3wcugc(?P<7M(0kJEsL;wH)

diff --git a/dist/index.js.map b/dist/index.js.map
index 578c14777e29398e8beef17253c22a4b96ad6f5a..281140ab7fed2e5124ddbee904dc5740971ae3a8 100644
GIT binary patch
delta 1058
zcmaLN*;kBl0LJl?YE)C&l%ig*u}m~(vTxZnvcy<2VPd9CH5nN-g9s@M5=Qj1MwDH$
zzS**8%l1DwF5FmeoNjz`<;un9oacPc^Z93+stwJqikb*H#LrOUmtEJnM2A}4;xncG
z-N{N!Q>`vMLs);Q1B6bAaf)w0{J;22jg_+3D|`LW1^x&?AXMmzAOs@>YJ?&T-4Kol
zL?Q~&=#Ch~q6gv-kDlm-1V#2HR<#PfSqcfVXbkx}S*sPk$i!%o@+n>=s*O^xXit;!
zqx8jgm(!MOPcr=H7OGf{QhkIlnWcs>cY&is?<sP)OVd3$N{3nc9u#TOWOfFbqPMwR
z7LE9Al`_Kq$s|);Lag|jCk1*7Z4!DzMjvR<7yZy51E56`24WDBp~GP4VL%FoU?_%R
zI7VP3MqxC@U@XQV72`1h6EO*sF$GgG4QVi9I?^!%GcgOZk%2jw3lrvHJ{DjhGO-9|
zWMMIuU@0uf#xg926*lA`7b{>#9`aED2MVzgPOL%^R>OrgC`Jj~@L(<0VLeK*0UJ?<
zP1uYrD92V*pc31#9XsH~PVB;NRACRQu^0QWA3hvF4G!WEY9VkKM{pF!a2zL4hm$yk
zdYr}?G@ub@aSrEk0T*!zmvIG6xQb?6!*$%iP29q5C}_bQ+{HcI#{;zDAs*o|p5Q5-
c;W^sy0x$6juki-$c#C&<j}J<r?PFQiAI3Sh0RR91

delta 1038
zcmZX~>sQMG9LMqFvev9oE?v;CA7LWP{hs?)MvP=3Y^}8->&F&FqGipU8T|;6`?cme
zByyX(IF2WtdE${LPXB=S!STfRoYy(u^FE(&M>yg;f|AE?Qpmv!jXLm6*AS3AYWYXD
zy5mm~y(NB=@AqFLdVQj|6FQ>{x<Y{nC=m%2x<QR7XwV%!5RDl0L@)G4AH*UK@kl^l
z^h5uU=uNC`lauRPV(O|AlyZ|nP|08Qg5&=b6{<D}jnVP8Qm4x;+FdrQWG~Q{+ifPR
zyGTqIWxrlX(uiq}R8gD9iP{u7&MY)5|4u`n&BD(}O^&nJT_I+c<?F1HB!968S*m|Y
zwzMY3%I$@M!e_J!NP>s~7>HyH!e9)67DJJOVHl27jDQYl7>Q9BjWHODaTt#Yn21T3
zj47CkbWFo^%)m^{!fece9tLC}6LVq2Jj_QH7GNPvScJvM#uDUUDa^>lGAzdm<Y6UN
zVKpqUA|Eysz>Y#VP=sQv!CI7H9h@kIg!R|}7u+brMr=YkDzF(_P>HRm!ZvJ2H9V-n
z4tP-uA9i9Fc4H6rVjuS701m>BLkQq7j-U=Qj^Y^VaU3Ub5)C+o(`dvQoW(hu#|2!(
zC0xc8T*Wn9M-!S6#0}iUE!@T(+(iiYa32rQf`@3uBRobMp5Q5-;W=I)jF)(Y*LZ`s
Sc!&4+fOdQg8LgixbAJKsbDY8e

diff --git a/src/model/platform-setup/setup-mac.ts b/src/model/platform-setup/setup-mac.ts
index 16164cb3..d529d21f 100644
--- a/src/model/platform-setup/setup-mac.ts
+++ b/src/model/platform-setup/setup-mac.ts
@@ -6,17 +6,17 @@ import { restoreCache, saveCache } from '@actions/cache';
 import fs from 'node:fs';
 
 class SetupMac {
-  static unityHubBasePath = `/Applications/Unity Hub.app`;
-  static unityHubExecPath = `${SetupMac.unityHubBasePath}/Contents/MacOS/Unity Hub`;
+  static unityHubBasePath = `/Applications/"Unity Hub.app"`;
+  static unityHubExecPath = `${SetupMac.unityHubBasePath}/Contents/MacOS/"Unity Hub"`;
 
   public static async setup(buildParameters: BuildParameters, actionFolder: string) {
     const unityEditorPath = `/Applications/Unity/Hub/Editor/${buildParameters.editorVersion}/Unity.app/Contents/MacOS/Unity`;
 
-    if (!fs.existsSync(this.unityHubExecPath)) {
+    if (!fs.existsSync(this.unityHubExecPath.replace(/"/g, ''))) {
       await SetupMac.installUnityHub(buildParameters);
     }
 
-    if (!fs.existsSync(unityEditorPath)) {
+    if (!fs.existsSync(unityEditorPath.replace(/"/g, ''))) {
       await SetupMac.installUnity(buildParameters);
     }
 
@@ -122,11 +122,9 @@ class SetupMac {
       '--childModules',
     ];
 
-    const escapedExecPath = this.unityHubExecPath.replace(/ /g, '\\ ');
-
     // Ignoring return code because the log seems to overflow the internal buffer which triggers
     // a false error
-    const errorCode = await exec(escapedExecPath, execArguments, { silent, ignoreReturnCode: true });
+    const errorCode = await exec(this.unityHubExecPath, execArguments, { silent, ignoreReturnCode: true });
     if (errorCode) {
       throw new Error(`There was an error installing the Unity Editor. See logs above for details.`);
     }