From 9ec229bef757ea2bd594f6ea240d0d88f4489213 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 23 Jul 2011 00:34:31 +1200 Subject: [PATCH] Fix utility to use Platform.SupportDir (#1067); drop the --SupportDir arg and the path passed to --settings-value; Update OSX launcher to match. --- OpenRA.Launcher.Mac/Controller.m | 4 +--- .../Release/OpenRA.app/Contents/MacOS/OpenRA | Bin 76864 -> 76848 bytes OpenRA.Launcher.Mac/main.m | 3 +-- OpenRA.Utility/Command.cs | 11 +++++------ OpenRA.Utility/Program.cs | 6 ++---- 5 files changed, 9 insertions(+), 15 deletions(-) diff --git a/OpenRA.Launcher.Mac/Controller.m b/OpenRA.Launcher.Mac/Controller.m index f22ab95e4c..9a5cfee9b7 100644 --- a/OpenRA.Launcher.Mac/Controller.m +++ b/OpenRA.Launcher.Mac/Controller.m @@ -74,7 +74,6 @@ extern char **environ; NSMutableArray *taskArgs = [NSMutableArray arrayWithObjects:@"OpenRA.Utility.exe", @"--settings-value", - [@"~/Library/Application Support/OpenRA" stringByExpandingTildeInPath], @"Graphics.Mode", nil]; [task setCurrentDirectoryPath:gamePath]; @@ -91,7 +90,7 @@ extern char **environ; defaultButton:@"Quit" alternateButton:nil otherButton:nil - informativeTextWithFormat:@"OpenRA.Utility.exe returned an error and cannot continue."]; + informativeTextWithFormat:@"OpenRA.Utility returned an error and cannot continue.\n\nA log has been saved to ~/Library/Application Support/OpenRA/Logs/utility.log"]; [alert runModal]; [[NSApplication sharedApplication] terminate:self]; @@ -115,7 +114,6 @@ extern char **environ; gamePath, monoPath, [NSString stringWithFormat:@"UtilityPath=%@", [[NSBundle mainBundle] executablePath]], - [NSString stringWithFormat:@"SupportDir=%@",[@"~/Library/Application Support/OpenRA" stringByExpandingTildeInPath]], nil]; FSRef appRef; CFURLGetFSRef((CFURLRef)[NSURL URLWithString:[[[NSBundle mainBundle] executablePath] stringByAddingPercentEscapesUsingEncoding:NSASCIIStringEncoding]], &appRef); diff --git a/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA b/OpenRA.Launcher.Mac/build/Release/OpenRA.app/Contents/MacOS/OpenRA index 8855166ff215fcb18eb1bed09df737bb3da13936..b9b0a89b45affcf241f8b816372aebc71202370a 100755 GIT binary patch delta 15533 zcmb_@33OCd*6z6(paK~xm`f5eRU|+_$RGp)Nk|ogRG@$g5C&xklL8_{2pBZsCI*zE zEDRiIqK%j+(D?t+4n|u<)Y7C$d>z}^piSE-Q3k{C3kYhOM(Tb0+<0C;n(h&AeRqSP3)=#BiVm@ehgn0VUpW4WjzK<2gyQt7|QYys%N=SF-Edb8f25q zGF7EPQ<5x{v!OI-$`)-{Bn#z1DBDKf?MbpwcFLw+Cw-JBNAhc5^x^fz-T1`b@p8MS zHfg<*EPShbr%8-|(tDO<=82KHAqS^0)*nVilNfu1KNdOE=(zFgn-d>=_l?|x6U{F^ z+I*eYM^;I#4VI|L(CvlAe0Kj4adD`_4a;GypUV_^x*)9-u~uj@Z> z_;tv6&hA#n_?C2cr6(|K+Z0UE>fC6sx-!m(FxGJ#r_JuL&BKA`IZKnGI(CQfo&#cx z??GX8?5h6NDGz`Bb4{VHxVKgKpjSzS4w zpyPCR$9GsMoTI*GosUug$d;!lEar`wI_3_9BfHtAXA5dzY zIom{(K#zj!+3E;L8lV1&%@r6ff`kkbjXYKjIT)VlZjYQKg3=5JfzxD9%ep*-v#Nti z6p9#O*oZ`>6X(piUuflf)Of+dsGBhQSV1@fP<+aaGbc=qWDrJvLep$>T!fj|j9qdE zjoXzW!NBJD#Upnj5u4n_vd!@$;G2-dtgnH&M9YTs0=WXl>I}qgfF?6tp_NldN@v`D zp_aP%;ITWZzPhRp7@OleSetYxk|0H-HcrPPh;e0*EV4y14bYWw1XnYPHUC`uOXnlxF=&#^3 z*_k7WC>b{ec0;vM%lwOgt`X$S@l(x?V|X6G%)0?%f1#^V zDJH$T_(a!l3I8{QKi0ZDjt1|_mm-x1+jmQYU(d+ma8_sylouw+F_R~vOT`T z>MCo;Xlh{Skzb7F&kjjYEVxVOIY+CTCJG~x5eRU;YK2W^;h;4C)G8cYpQ zXoAihC-v>hxQzAYkG&BEV^q6o~Sd;E=4`dqj|v z!V1a$j9~13hdt_{SVw+bJP;eHu=j{QLTC!^Ccr3Gkq1 zAioS|q`GAGgY^jDKgb=Cm;rJmM*ZIu(iyi;=3l48DJR8JpsHOmq6eqZ>L_S|oiorW z*1%>XhHiDrF2uJwc11zLs(J)En{!AevTAeY1d*jH<3TKIo5SOg^J#sH)zlpZ9$6Aq z_y`I59<_ocBR|LY>28bS`2rg}dOMH&+nj^_!JZLp5^dj^G;69~Dlx8*7Wi*+TU~*t zDNxwB7HjjkB=J0Ba|}xochz=u^R3#=SLEb;pJssTON?FYHgOxoxcgziIW(MCQ8qE~ z7pZta&ENmy>jB5lBjho)Y_<;YJ65%X6=#k$8r`|FudMN^| z_sCC(gi&6~!09q>h=H`4wENhb!U!394GbzPWS9I;T3)V<88mNa*F^0R6Lg;E5&fx-ikO6TzFk3Yi5HkDMVq8k@(rqQb0se2dyNQG%A9(sVr;tQ{;7hD$Dp=!_vZ5^h9s{R*Lhg zo{WDxtbjj|Q9-vL{>|^A_{EG*`Pah-hE6S7x@wvwrJ#8E%H_oy_^RCl`t;~wF|Azv zh-ulvwWdW&m##9cUATVf5>xSN6F2ToN=&t_eq?RxI@KWshHU(rHLKUKS<6=~S^dP) zB|Z3}>S_GV>O~EP%=vx|m81SFDV@}BaTs1$egP+5SkU5rYPhiXqQ|prFxC^4i*Sp+ z@F_N~s%3F1VkP7~frP3^3L&ov#Dk#liXddSKz>va+Kn!37RVVw6jxk3L2Cu{rD}AH zkc9$iR*^bFrV8X;71=>ZjzDTuq=b0ZlwhvpO0hp0ETIkydjx7z>%n6e84o@GG zAhq!PF$sz7cw?t5ZW0D}PP)rdz8$uY@f>gwV#wBp;IHU4@vf7*8Pm7QIg^&EBj~sxnJ)-7X0HcrG$44G< zx4*)YeGH!Vk)1yB?|tO|@{t>SbrA9m%>&lGXm%AG-jWKVu*G$ZbCINgw%N zK5`$Q%YBrOY|&-DaD3$Uxh2X$Y}0fZnLyb6*kSE*y);0@Z)h#)3?R3r$CfPoeDy7w zK1kCWwO04X>xJ-(RdIz4&RFZB9#Y}WLH5>;HkdUSi-8ic)m z)#&!Qc(jhd|E75wqMgrJu+w1{8Ji{$lr$L)G-ssE|@%ihGneHGJX1j zqyEdFxro4L{|aO*Nyz-G8S@k0d-QHIz1Z_nX)^mK zpHq+;UJcC6549CHng2+k*m-uv{=-k*tXQDlfb{5(#XlFClE3_WW9027A^dKp?H206=s~{DUxz<*rT?pB&wMFoH z7;+orN6@xw?NzO1$owM>=jJv@4et5o@a=_BJBsRhq+!3x#SbcJQT$Iuqk0q#XKWh+ z74_$q&-?I*$4xzM=PE;pcV_G zH+F^x#kE<|DehXUNSAp?acHxLA7Zh?&cB0k87jAKg7$kW%y@gD2rgED~_ zfn);73bH~nK(a!L;Z^IC{OUsaUwilE|5%?YnRw6>xgn(}1|FH%2^2@>HD5;X3WUIkOuduF}-ykMfaQ(qi$m zRRgl?EDC7eOg|t|ZQct)fLk9H@y%O?430o#r|T`KocR%szc}-voMVlS&8+~MH@D%u z0UphpPk^i7-)xEPz8!MMKO(r~NDXd9CLN9Vg4XeI1kZLv_oYuF%>lF8V{TFad_>%_z@59qXx11$EayiZ!+KEF@fEz| z{5|}pBhl~BJv?q}q*9FU5KcMSjPvBPLwn!@+LMILyMZ4coMpH0b=h%l*39XZmj~At zQGjtt0ksjRG(}n^d{+`YBPoE8xdK_{h0w&GBY0?%5jS_jNBG>x@=D?u9VLNru`Pnw=vyspEA5O99%wz-oZC zHXX=L>Y#5lj$^eoIt0gJvaxyriwPL#1xy2gUl$aNGwQGz`zx5P31A*#0xjAEPSOOL zH1As4hbTuzgmB7kg0-yO4u@U6ZWpZCbpUl17+_>@%5`4mpOLv*jAf{XNwa?!Ffwh{ z;?Qb30EjY*-G(Y>sLj@un5+Xzr|ey;CscDo2gdD`GrhW;$AAA^oN_|*uDwMJrjjB; zw0RlE0&z6gcIcK@HOl}kbf*a2>g93K2#*I0wJn+pjr&Vr^kZQw#!Zw1Hx9}m4EQuvmp zqJ@?Q^tXlU1C-XJGfq?umnG#Y0O+M|Dn|WSsh@*-Fs#QjxVz#flAdDa?t|h|;GM;Z zq%=xleE7C_qQoT`@!LE<10@#0SuJjDCo$-K6>z8APLh790>L*5KH@1WCE8U};bvSq9Hd?!zT$!p5~B7Jdc9 z$GODqea38|poMzSB&}TMf<;hStTkk!Ypu0H;k;{vM|j!x=s`8)K!rW5htjXEXP|M- z+evpY%33OSZ_iV%;c0ZUd!2z+-7nzP#1xzrzw-PDprVOVMtSVINo9B4Xq>XR(;#E# zV2a7-6j86GUbnASD4g<2g0(^(A=5_6W3?p>J0m9ML!SBDaYzoKu(Yq&0Sv+jXn6}U9rl3VYy7VL_AKGjkQq((Gp75s{ItKuDGXxUsg^VEtx3Mt+PTAmv4+3sY{~P^=^LGi;T%yIjQ@9{lIF8*_vY+wD zb$7|m0&z6*cxR-k87x)k@PDq*LH_(sS=mAM^uXX~fYDIX>Yc+4#HNAff;O4RPFu-UdC|0kwK!M@}-+5PS z?cDOa-qJZf`*&L-r%a!`bk#c2Ojxt9XxZ|`Yf~n#Ub2**8b09v{pXtS-~3#|ckNE# zo{VgMW%t8;arIPwa71B4#0yqGzTx*<_;_d zZ3EFkFOd82$Zi%A9{dRC1c1F$93*!ep}yV_KyoBxJne~t&0h1B!->`&CzfWXMCkIVRyfdmkUAn&e#OV(5ahdN*zj#_0{(i?q+HFyhZKAZH~@Mb^cLs@=qFHb z%qbp}2FeB5K~I5Ppgo}1K~12Opo^eRPzd6gKq;Uc&`i)W&|{ztppBqSpyxq5vyi}Q zFt30Pf!v@|p!1;d7=V8^Rtef!pm^{pppl?Spc$aWptYby8=G%twGM_p8|=d^>_r1_^(6keb2e;0L5)=4grkd9eE3`V1DwWo?0UYCJ6_2{wk2 zSeJM#=sIXdw){i+M?!YE3#5pKneM+x_tv8~eC;e+&(`^~mc`7UwbH4LPA3*)<+bv$ zANPxxF)qPov-kUk0<2OhfZBfLvGTv#1ozb%0YgJCqtd5Xf&0xn*Gl_ zys>WxB`aL}6!|K*H1-XpsSnbS0jYdVL)W_nF4i zAkJ$%b$<&yeL|$KP(37kb_)xm5@C&?)36>`$QCu_#J7T{Kky}<_Ukd={b`Bf-%Jgs zy?X)iptR(M+f5t&8lGz|Hf%36?r8gCP(3d4a>k+2Ev)3eE(+H1yS{=NlLNp>5)SpMwHZX7wOsmpU9+ zzdiruhUfqOK0ZG#;kFA8q=cL*HTWGE^D+x8+v0bi)Zl-htbB1v&U08M&-G?y4*vtC z!Ty>Y*~Z-$`t+7hlr8r^Fr_@eM6TIp{03CX0{PVoBV@akh3qfg7_-6rw3Jk?uwckC z&%PKFR7`dw2WBqeg%=}(=2lsl6*`HRUrY$Gl$OPmD3xbQfMoExi!n>{G7FhxWx=&s zwQO#-8~2`ayn!`eFUdTX*{W?$;@Od5m8nR)ZxheAm z^zUPI%)FPyW*0Ih@EXR-7uzrM!Iu(b89gy1*+|ipv;RiKp0&L2Qg6SWpYW1PeU+k8 zC8nfGVuqcGo*D{KzBoTZX}VrA>9)t8!j*5buN1r)f1WVLzDyZ+yh}$D6F!^lOW+r! z`_Pn1pX$;TX18N#H6nIw<}q^>Hba*Ay}2fHKfnL-2K*O=y34uqnh=5In4p1m=6-WM zEZrjqn%l@)kBrf{1z)I67Cyni>UF(x?%ySl>vS8M32aQ<`act-c3$;AL+72)W?Qe$ z)_zO(g>p_V@*u$|;Xd9$)^n+f;IQUQX+>+%6#OgM(;;Az() zmAdz8JvV5R0_vylJ{0AHZ#|UCYMP8z0^`%)nN5WZ1CJDCIhqMx>z$Hhq#Y^iI}7$K z7Oe4wR6;6UE4NKO%5Uw7%3cj*h23D~^O*YBS3j2INrp`g zZ@Io2dtl~`#gd8dxiKJmnVwCrYd#7&N#>_+?8a~D#XtQ)D(102_mz%v^UsZvy&>S2 z&m?}Ob09bWE9L*<&kTG0=Dn5i7yk8qL)Fbz-xt-LQaAOLnZNzgB!xZSZX_~@Te)}! zu{0rY6Zhl)4@BX*BYx%9YP)qW|I(A`7Q9;tE$ku(ZBv?C;-e@e-#z-DahKZs*o>39tFZd z@~C7m+N-LN=R(Gl6dfdIo&XanMAe=ieZsxuEoKN_2AOuq1}}r^yY-_ELiU>BsQPzK zNm76Du9}0vW!(#U1@sySk5O4|plev9$ZB>U5HgaT1+syj069SDBOCVFZV(2XjmPKg z8@SaWQ}jPC=#RN_MuMh+mVlOn@VzDHNl-b+393RSb9RE+3wj-N6m$~w9R^@Q>p_dm zWlhIh7zQ#LK}TnRCV(*M(F;JUK_##u-QPg%po^fNvBe=Nx&1)*gYc@Ei|6QE#L8U+ zf?sY4Dw+EXXdCE7Pz~s9&_^JYBKI@UH=yr9R~YI8GNMEeVv%Fk-ZDMd(vx!53n0W3 z2R)F&o}PsB-74gL&Wa;rZwEi9(^QlEy6yRq3L<2|J1YjypHxRW@Ny(-25dM|MpMti zf*Ohuh;#u@uK|w~5`N!Rw3v3*Qp7f+#ng!(atpEiu^>-_I>2L%j6w|skJOF&72hke zXyF8d)Pp9(@@dtZbWv4cchKRm*kVWKC;K+9<6|v3bAGx%cWY?Y{5l{e0g0;koBL z-{(2cdCv2kbMC!oXgL|+IvLOyIW|fVgb>hRkiQ_5qgZlS#fG8`7KCmTi%hSY8uj7D z!v#SE>j=XQS26pSJ~#Yql7il+fWldp9-bR+8Ka=r2Pv?H)d8J7K|u@246fPiX!snl zymiFTPerkZeLHN9!8KV?u_+n?@%~K((QH*jfQ-#EHVKIcos<2aai+CS8WNxTyo*>)`rSiFga6fx6a$F%INw{oYU~Pz9alzv;FYt`HcZ47ei5EO$el>z6 zB#)iC5`4Zq*y5PoneM9h3>xypJdDpGZ`4^DGUlVX+lysg{ICk#7?(tX}42fav#pE%Af~kp%ok&iQ-U%gno7M4+`wyr#RQmhX{Vezi!p0~| zLrxAlPItL&ki1I~b>C0w4SQWMccw%IkWYPdzt>4-<;zd`bIv>@6somFO4 zW5-GF#c>}px!ox@?B3+_9q(Hm7cKs=ZzPagIn_#oH%C$cT5;!&7#xw@&QNYAgxm3l zBgCU)k0A(^P00J7DB5z)d~PLhtwhZn0ZFsdKd?3gZstZppW%h!4aH;+`bc+q3@5d| zGCt#dbKcWgl@D_vic=@J;A5`XhS;5_nw;}PEcs@5T(RfkN^fzcBNBWh0P}%@CFdOD zx*3PL((7E(VRd{3HLnpj7#1nE{s;xD<42F-AS#<&l?JQhJE*?QVT^hoDi>)ck(|fj zIaDli;0^;7#`I8{Ov^|p$KErNjU68?-ECfIE;1J`u+;ZPNpGScQuG&P0^DYc<{LeKD`v4N11r65j4xkdgm%8sx)N0pqXi=iVwfpRk;T7_=t}< za1xC{nR2t!X>8XcsEJ{!GB#-`RuRp&yZLIOKrcp3<>j1aC2kIm)hjwy$5p8PhC_CO zwjAzx42!t8G$U_Q+>1uRr^8TG-VC5M!Po7uk%C0y;tQ9$p2^$O?xrlWR+={r z8T}mo0e7sa9WG0Kd(^$=MdrokCFZ3cv=vz#=amVhw>YjL1?Q1+i<~{!+Q1#aj^r_n zB~RqQzmTXSfIr;8w#7(X)t~DOQgmMN)^RNEf!=A7IA*&o4YfV+CkL#@Fpa?ac0F8C zols}8<66Gs1a`J3@PN;kXDC~4L&h#FB9Ea-SxQe+foUUg0Bec%TN)wXZzm!-9z!yv zNX|*2ei|~?^X6-D=W{TYc=u^M{4FcGA-*3hCaLEbH?T(K3@cDUwzm!AHp)1RmC6@1 za&U+}HAydVB@gYS`I>@>+VLda&LJ3vI1?UGCx&!#4ZD#MV1}w-n84dm9&ba<^WS*) z5;%>xa7T?W6o}m*eK;GJ8Y^AlbAys-3`Y+#GFsFLML95qPm0Yt4?TPg<9Js)_296$ z10cg}J3%1UIQfP(j_6~J6XSRfAy}z|pan{pi?o>WwAdWQEsUXbSmhk)0h-R(zpzHE z4v)w194!|9=vfU7j}lI9Zn|P_xtBR?IB?X0bXnyI{;1C8)g*c{Y^9k@+e96o(xD^K ze3Q%45SUJOhRo`;bj(W9V>W`5xmOm)EIhUxQLGd_m>Xz4LD^N@6C)ACggzQn;mngb>5v9$U~L-r8rW_G7# zvL7DdSFvO)b?sMJO!^q<0#}}W0Lot|0rD9Bi3)ckuuYM+K)PF#KB-gy?L^IEQ1~_s z>ICJvA>%Vm^8_l$CFkY9#}!+LpxC7-RvGx7(cv+y;UOiD|G*p5HljScRNiBFK{2*m z*+%ASImo-w(xN~#7aB6g^FSd-qm)2zpw{#>ui*A+V$*=IX1AlDRoIZRii^-@DODOW zbXp%C@R(8E#5ZI#Y0224B;!qb4O1Qo3!&&S*ti|);y2Ln80@&ChdUkLTm2{Ai^L+o zU8E!DG)RigmwCejydgz_c)kND$$o{4DFVKHzGF7*1P+4Ld^vj%n$k4)81~|hwTAcA zO@DxYz;7XM<=O)tgUJ1%XHmyczGv39cnt4gi7Ce0_+nFdJd6WrI^h9HwsmBKX1)hH z$Smja%B$x+yr}eW2-A}5(Llc7W^blbme<{ATBATpK9|yrp`I5i zQ|A?GPWjx=JD^~9q2@8XkGqo2JzRn&j4BNo*;*HqsRDgivc}TR(8i5-cqOul+mc!F zl(^s;Md~rEW%enCC<9gxUcmRz>c&fe*2(Ma_fv9M|CIT9&zNnuz>_gg@O$GeY+goP z*u;seR+pAde6Z}Hs^ujW>_o;{QDCXllGy80$01dBm6ts<-#n?Pa`l?kmFp*!RhO}U zPfbo2W>-`^Tp`@O`k~T?A1x~l78X>Mmp@!lIcs%A&KQ%Rs@qB`R}qVgm0yiy`=`Y- z*Y0JlDaIv!F>5O;RzI{dZ~g4*@{)&2Q7v4(rnD^oA!@`5t`BS7o!Kf%*XSu)IRxKF zv^miC(O0xd)VJ#{O#I5@Sv3K32*NTv?=O6W&8l%#tb)uXEckXHz~iz9C;$WB6XIMS>j8weTC zk*x|+LdXb?R4B+CLI!iBj3WzUCld7i&onZtqBM+<&p9$#L4Lyb*M*}T!K$T^ogw61 zjsPI!&xHJ*5b$hIPQoomivtlDK{%=lU>!N}<8;CVel8%0FJob?j1v4l#G@rFR`A~* zEBJkdS5BM}h~a{t$n-N3#EmR{#$7>Q;;WUe{VY9q1UofjXkZ~s7O^*HObh%z&Nj#$JFvYwR}Y__o}6=mg|*rq_9#2 zFdTk$($Nbpd+WERcro!14gn~(NgTX+)71XS!t>(Af3x(w_(WZ@qC5Sj8n0=(dF&DB zT38cw=c~G*|3!Bhdlgz8>Y)uj^aos;#dYjkZZX^(FFL4&xSJKsj2HK^M`or5Rl^bT z-NlaP$BQoZ!OZxfTT&EEGq*Q|othaZ{m}>hn-71^hwt;@uln$jKD=)1z;2fho{?@A&W^`tYCm@Rxjeas0pt z4fElXy?J`0o#73DzsrYT;=`Bw@W1up5Bl(L`|uxm@%PZWIN=2l|AP-7>9b`_^WkUs z@Iz>>H5JrLZtU{3AQM2?`URc38-A#62FKNs%OKaQ@}B=9k5c6qRC%9IdwiYn{`wVM z5(cZY9*+brAO(C~3EV@JnjDV`F4vZEg4!-AQNgvS_A)*dbh5eWL|o zfvSM#5Em>_c?}O`iTUwCwJPdj&iqKWEI(z0hV&SfcCg8>VrZm_?$)FEX9Bm|@}lj7 zUu!fiUHb6y`&TS2d$7E6{nB-nCCk^82^A;VVq3g;h}GJn0vdI$O!hyvESzwkuw~!c zHyCa1%DZFc(wSECf(1*Hmd;yHw6?5bR@r?eRck8O3icjou-FyRffcU7jg2hTH9D}O zM|2HmQb7zh);$H8eh2jIWI?>x$F3Ai@oUzzN%JH9w&>ZM`C|eO4MFRsk{Gsa{>XrC zV(wi&lC{r|_p|F;&(Gf~#+}5B@mnFxUnkt{FSJx*avY+Yi*B8jtf6rHsO$Isw>a^kk>{i-CAJah{zjT$1Rkre&HwqDgHfyQe5MJamN8_)!%NW&cx@TA*d?c@@=o z>V}?wGx6d<7x8p*?ah-*+N^0;+lR3c3sb|jRG(7O?d+a~sRi1MxvHWXul1Gb)0a0- zeQ7gs$Y5n$N$l?nQ}eXnDrN$`^%fj>s0(fp@%TX17F?~$YYXfdm5<6~cibH(?NDQj zQz{`0ogGm5Nh+_!p5B8U#q+p$fs3a3sj5BYa!}ZcuCNrab8u>M%xcQ z4i78sXPaPj7KU+Z<4#t2ZQLf}y~bUl^4ho`Q+aJ8ae^N*6uH*k+g{*+AZYJzud2Ky zlWi@I3)f!fP7w?$Zhf=(4L|7$!kLer^*TYg1EmS&T$FC$R+JX-h*ek*_<1P1QQn0z z4Y&}2AiS2FD27J+M4%Wjm*z+X|zlPF8T3y3h4E||No_4`GwVq!U}D*@TnvQaIY)v~44 zxnxfG_VRv zV^K`?>q>4a7|x#jG>ol_y1ms{y<-SV+cJI1WGuzYjg9raI$MDoEreou%USGZ4r@|~ zyyYvLQJ|)~r?~CDMpbP8nC;z?7K2~gS`k{gJfLGU{q9AHc{>OO`rj>O7q(0kf6XEt z36mZK+_CvM6sk~j>^zB@qv15}9h-Y_r!Mgmz-9>Dxdv9|NDa9SUuupvoV>YH46NBP zV)VO+DRj`A;QkbKM`cokyt$n$;m{5TcOidgrya4$GU?&ejuah>k^(flbO0BW8Ia z&jP`ZBN7d$lU10ET zmwF7T-^f#vsy+xPa$vII$A3y7O|(mF@3t7}lW^+LJ74WUD8^UdplmRD*?tic{%c5m z`-FR!(9a;+%#f>e&XbytwC&PV*uYI6_cE{=2vXjwXAzImwGkCAt?&3Got)usQ;-)U($eBe+bA@HP`7< zJ9Fv^6#xDJfuoH)w2-aCnmk06ZznlTwnM6fCR;7QUuJG4sbUJsv6QyCv}Sn(0AC!W zfYeVh^>Yv!JYAT7X;8p#Hn;GZdH{lpfj1{3f}+>6x+mhKK0K+B7A)5Y?>NH_!h8%u zOar%S*4a-L;BNz$4d;kcXWa`x;6?}~gb%DoYjZ_y^Ela}A)i(yG~@~v_vF~5W(|o* za?_E%bB_iRdPnCLA``0prg(GA{Erp4lgU80;Die%AJi~ zfLRAz@bigfkuF|?pA_(4HgRCT>HyXD0? zC*PU%j-qqvf0J`)K|4#S9bD3O%q|=N$r))18bV=NMQN*q)7eSxmmzg*UWTFHNW5&| znU|2CCTeS#LTy#|CDKRg$xgMGot1>YFK-BtXX+fAOUa&hUMwFUZ{T!(g}7&5CH z77}QrGVdKWW8hO1CNQ34)ShKEg-8dWdvhyK(Q+TcJ2UX93de3t)l(1*^tTfT`6^OR zh6!FHd6|qr^2_zQ1CoZtJFxf$@zs~Zx|;GO58i?|yQ*}Q>Og2Hp)Wc&S&xSz{YzC{ zdlxzxu=Qo%c(BO^{$xW;FToBXmBY8;8n4IYDF|dkxtEKbq}oRAA2P2&kHtz7`E2_= zWF+ZCgz$h?TRF9-9i7|L=ww5oW)OZ?6G~4wo0p{(0A)jxms-Jg7O^Iq!_RxcS5K4;3_6f1#@^X5IhGhUgj?clld4;30|B9f;%E#U=SYYbVq@Zt$T>#f>3^eNl|IF^_zx+HB>V4k7qxep z0B*}WIp49RJ7T7uzzZIw;pBf#!|M?LG7Zh_)g2KLGGqhezCMVFY}kXPT;Lt~`9KCl z-pp0JBcBSyC-N~|$vg7Fq~sm>pLDE_#f<$2wn|L2+2?3McFgWkiqlj$`BtTFajoo` zoiQU{!x0H>So_h+$<3?cT6TQrf}F8{J7(ew2gAc=KpPE|hjA1)v|ZfiETmMW@t+L;v$nO{`^CJnP=& z3?1+b6D!|sYklkLi~pCOkyifJK|P$A9@84Pr$=Ph_e$c{*4k&%Mb`4{BFT*e_k#LB zmqFS^ymmF`3PK~u4k`yN1KB_(P#P!!qz4J0K75q*fVx30Pz$IT)Ci)B4&Zm=8^FXl z{KU*pe9azu4RfI~q^ zpvjAAq_+XFzUH9|+0fQ!NY`?#CMN=IQ&L z&H$ZtS&i6EMq^tIm(*?=n%94UJ@z+&V_3#8amz|7qvBtZwAVW8qkgeoV?ls3Yy zWhf&bk9x*!O0)>SJxz%q;YH(=2rfqbG;FLyN%fZ|D97cWVs_90FwKx&wNA6?d(``l zn5cNn-?(T*wt`m+UJu>wDiVjcE_8h;j_OL~=d9)Hgerf*y+ZI8dg<0jx63PFxSP#9 zGG+uFqEh=wxXnnx{KBfE&-odw?#P^cZz;Llu1cv+t!T+FM0}_|4>zq&)@Uf_RQ;D& zc-!bu3Rbv!2wKd{ZKK0z=;Ku6^dwf%HY$grbcYI2UF+r>RH#nfXm#p_BD_@9&tOMk zl;XcmMXqHqzxGK|2u2o-#$jlXhB{@9>NMghYMsVZsMg8%I<-z-Kdsiu-?!8{Irp(z zCnvs8>(qTe>U4NX2VTJ<4*Z7T(}9ktZbhdMX;hn#G!>e!&$-u+6D70c_mAdIlGL)}?H2?!V{If3%d;?7H;ow7SBT@=_=(9XdbRUB*q zi1}=80hkrk4i0V2?cn0rU#do;-F%4YTrMwyx5K#{f!InYKzZ2!quE{SVhOYY)B&`z zz7x5kiKTrqTI^(npX7#4fFv0Su0%-(a}$z|ypR_#YybC&hhJIQb}VD}R}f&x0{Md= zQ-@=%O$E=kKKbc8;jHDt?MuSaYIJ`4^PUv~Yq$9AuhIGMueGnJ&e?{kvTb;2t;2tR zO^CnBM-|Sq2PE9kU!~~hJOJGXh8t^F`|sD}*(U6v^}--l_|-In$s&aQRI@R9z3DMA z$u0>Y;8(NeucC`eNpJdCW1%$jSap+Gur-wkg^i*xt0_^i8uN_SMzdgnc2P|YwHEaD zXN3^bwO|(3pFzFt66&ElYigsbrTWjQ?qK?h(Pev$%LLIPgnXan6c%N>Z~$({Q?}z$ zwefx9VQI_f)y8H&L3-{YT7)!_Md|sAz^F~A2p@IX&^K-}wu2AHNCeX}LQM8D9GVi| zj172&t&cTcjGwp~JqhqfPu8S!*I@CM@9m=BBKy69P$LXoZ!{tGzY}!mDVCkSI6A$u zMvAV+D0Mp$J#XYQI!H_h*kk*|%@9mGe4U*5}#Qu(aODJ6Ay~M$@R-5M9k% zZnBjcSD2bLoJLx+@`h{~o+LtcGw&h6_`a!edII9DGqtdq-VNgO>`HI$;!fBN$N_Hb z0qrxnpw~Tptf>bZx1iaDNA0}6Oo;&6=z+ba$))qxs=>EtIy4&SB(WV|&%t^3>8~d* zKBE-4d-LnWa~EWGv8>}h%8B;^M1S7nt#Vjd?eWz1s}~m zv)=f=Il=fPjmDhzpGJecipZ;#JmPU*QJ}*pT;9FX%u*wL7`>Y?st`?HQ-)cGtfS4L zxj)Atd8(n@W}d{?C`_bm-)n1ODc{5g9)t-Svwjmj<^bWCHWAdZI*jMJVH47jDA;(L zZQrDp^yb2fX`2IlsvA2bQ$NnMcC}EVW`sud*`d``Hl*}vv{5!U^`aK0n znRP-<)_X#wGz)vs=nuKONaz%)^dG#=14RkDPubxRtQ$kEd6W_^@ws+$8$f3~!#5iY zh&mGmW6k|HCiODui)+;zJ6fwZ9(akCY|6$9Z&#y}W{M#>#kW?~u^Ud=c??B_XTn^z z@4KPWVQpP(-1HnKL%`~6JhO}?Lh<%GVHtA@YtU^us2EfVT7@u(v`Zk0i=cmxy2q+J zdcb-+qHAB^yMqSQ852c4WV*MI9ZK6gyMQMW%e)jG8lx@}TisaODpq_c`JT$U-zht5 z?Q;(((KO*%b;MR)+rIV&PZ6d;)}6H#W8f{d=QeN|?IL_GK>k?1E#%F{7>}H$3|6gJ?oAASE@ik`qp-n7ojrj3n zG5VLE;&>NaKwswqJ9}ju{~*`>bX$P--=6H%pS}zm@cAvYK6Ul4|8L*klJI1Yo=B&B zGtgU-`5ed%>QzcXy~ggq8^iwxB6EW~5xi>5PI}3rivxYA4CO56r{e{aUV-Q$`Sd7M zk~pjICe+n$ST47Lr&k$yxQIn>xsx1wP`Y+(_-c>}4)m20;C&<_*ey6zt%=Iy9QVdpVfd2;SRZ zGkC8NXC8RtuqfUdCK-=ms~HJ;8sr3Fq*?GV>jEY=Udyu)_Ut4Oyw8T$*$;#2K6V!|_=j=n}1yC#K2)+vVaTIX4fJ z>r0f#f9^_9CDNRWhPg6`fu04yq1@L&a3=QyP&eod$PMa47}d{gBSwbLgaJIgo72mF zRukwqkkN&R&}5~T`GR(i+`J{C%9Xtv_yJ5)bP8IU3L+&~$U<_nhT(-7vE)~TVM_U5|N3pW%i(saAzWq zypBFIzZZnznf(xifRu{{Box?QEqEhzmw$p78*}Gh?!693q_0wJ1?OO;pZ_wB`mXE* zah7$U200V>dqsolf|x`N1wSgpdEAOpS1gi~fgdUQ6I*t5C5WR#5r@F53Y5BNSAT*y zDvZW8Xqbv!-Zddn9G!y@44SM!6b`K?@%YW2l)BOrg>R5W(Vv{MYa2|29t5;hfum3E+YbeJ;QcGM@Sb&On?qSX1g3Y9t!a-CA=34B_uUxxl$N}YT6u~H{5gfEmj zC0FPl!q<9%4FiZ8qQf-C-0K08Fa$Y59UY4)YP}crDM+ba*&{`Zio1aq&}TG#-@S2g Wlvv>xY<5v5VW9hss4-&H;QtM^zpR1) diff --git a/OpenRA.Launcher.Mac/main.m b/OpenRA.Launcher.Mac/main.m index 0c84cb1c01..27f8b253da 100644 --- a/OpenRA.Launcher.Mac/main.m +++ b/OpenRA.Launcher.Mac/main.m @@ -13,7 +13,7 @@ int main(int argc, char *argv[]) { /* When launching a mod, the arguments are of the form * --launch */ - if (argc >= 7 && strcmp(argv[1], "--launch") == 0) + if (argc >= 6 && strcmp(argv[1], "--launch") == 0) { /* Change into the game dir */ chdir(argv[3]); @@ -24,7 +24,6 @@ int main(int argc, char *argv[]) "--debug", "OpenRA.Game.exe", argv[5], - argv[6], NULL }; diff --git a/OpenRA.Utility/Command.cs b/OpenRA.Utility/Command.cs index 7d75ec66da..df8c67c88f 100644 --- a/OpenRA.Utility/Command.cs +++ b/OpenRA.Utility/Command.cs @@ -39,16 +39,15 @@ namespace OpenRA.Utility public static void Settings(string[] args) { - if (args.Length < 3) + if (args.Length < 2) { Console.WriteLine("Error: Invalid syntax"); return; } - - var section = args[2].Split('.')[0]; - var field = args[2].Split('.')[1]; - string expandedPath = args[1].Replace("~", Environment.GetFolderPath(Environment.SpecialFolder.Personal)); - var settings = new Settings(Path.Combine(expandedPath,"settings.yaml"), Arguments.Empty); + + var section = args[1].Split('.')[0]; + var field = args[1].Split('.')[1]; + var settings = new Settings(Platform.SupportDir + "settings.yaml", Arguments.Empty); var result = settings.Sections[section].GetType().GetField(field).GetValue(settings.Sections[section]); Console.WriteLine(result); } diff --git a/OpenRA.Utility/Program.cs b/OpenRA.Utility/Program.cs index 91a13d19a4..6c76c17d8a 100644 --- a/OpenRA.Utility/Program.cs +++ b/OpenRA.Utility/Program.cs @@ -30,9 +30,7 @@ namespace OpenRA.Utility if (args.Length == 0) { PrintUsage(); return; } - var supportDir = GetNamedArg(args, "--SupportDir"); - if (supportDir != null) - Log.LogPath = Path.Combine(supportDir.Replace("\"", ""), "Logs"); + Log.LogPath = Platform.SupportDir + "Logs" + Path.DirectorySeparatorChar; try { @@ -57,7 +55,7 @@ namespace OpenRA.Utility { Console.WriteLine("Usage: OpenRA.Utility.exe [OPTION] [ARGS]"); Console.WriteLine(); - Console.WriteLine(" --settings-value SUPPORTDIR KEY Get value of KEY in SUPPORTDIR/settings.yaml"); + Console.WriteLine(" --settings-value KEY Get value of KEY from settings.yaml"); Console.WriteLine(" --shp PNGFILE FRAMEWIDTH Convert a PNG containing one or more frames to a SHP"); Console.WriteLine(" --png SHPFILE PALETTE Convert a SHP to a PNG containing all of its frames"); }