From a3a6c7eaf0df9f1c4203bbdc11abda7f7f91270c Mon Sep 17 00:00:00 2001
From: "James M. Allen" <james.m.allen@gmail.com>
Date: Wed, 14 Dec 2016 10:04:33 -0500
Subject: [PATCH] Adding compatibility for OSX 10.12.2 Mail.app, updating build
 script to automatically put UUID in the correct place and avoid duplicates

---
 GMailinator.xcodeproj/project.pbxproj |   2 +-
 GMailinator/Info.plist                | Bin 3174 -> 1966 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/GMailinator.xcodeproj/project.pbxproj b/GMailinator.xcodeproj/project.pbxproj
index 47d3494..98126b0 100644
--- a/GMailinator.xcodeproj/project.pbxproj
+++ b/GMailinator.xcodeproj/project.pbxproj
@@ -196,7 +196,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "echo \"Grabbing the mail app uuid for your version....\"\necho \"the Source_ROOT ${SOURCE_ROOT}\"\n\ndefaults write ${SOURCE_ROOT}/GMailinator/Info.plist SupportedPluginCompatibilityUUIDs -array-add \"`${SOURCE_ROOT}/find_uuid.sh`\"";
+			shellScript = "full_version=$(sw_vers -productVersion)\nmajor_version=$(echo $full_version | awk -F \\. {'print $1'})\nminor_version=$(echo $full_version | awk -F \\. {'print $2'})\n\necho \"OSX v${major_version}.${minor_version}\"\n\nif [ \"$major_version\" -ge \"10\" -a \"$minor_version\" -ge \"12\" ]; then\n    compatibility_key=Supported${major_version}.${minor_version}PluginCompatibilityUUIDs\nelse\n    compatibility_key=SupportedPluginCompatibilityUUIDs\nfi\n\nmail_uuid=$(${SOURCE_ROOT}/find_uuid.sh)\n\necho \"UUID for your version of Mail.app: ${mail_uuid}\"\n\nif defaults read ${SOURCE_ROOT}/GMailinator/Info.plist ${compatibility_key} | grep \"${mail_uuid}\" >/dev/null; then\n    echo \"UUID already exists in ${compatibility_key}\"\nelse\n    echo \"Adding UUID to ${compatibility_key}\"\n    defaults write ${SOURCE_ROOT}/GMailinator/Info.plist ${compatibility_key} -array-add \"${mail_uuid}\"\nfi";
 		};
 /* End PBXShellScriptBuildPhase section */
 
diff --git a/GMailinator/Info.plist b/GMailinator/Info.plist
index c01268fe3928048149a7ef230ab678f9983f0666..2b90c37bedf3e7b83c4a4c0ec1c6d944c8dcb9b1 100644
GIT binary patch
delta 1037
zcmYk5U1-x#6vuCp=5FdfGVA7At<J5^&(@^1U8m03G@TCDIhWe`F$s5V>@KEFNK<jB
z>_G()5v3?7sE7zE;>UxJiZ4F+=!1d};*;}1eUynHc)Q-B7jl2+<9|+04rH$LN$c#C
zW#Ez{il2oJhUHv5Y-n7xcu7-pORLbf)V-{|V|k~?D}|zcv3_aW_8mK=!Ci4VAx|jj
zgIP1DA5zk)vUd~}bWP|SRriz&s5q{p9GWupglWy#I6v)Z!Wy+~S*GpixiO=h$HjzM
zu#khNu*bm8%z*>LN@+4NB$tahL$5XKt(@k2TMjR@m&@45X@ckKH&44JwAO_g-7aCX
zs0r??&)prGAdISGHZEqdg^YxON+nJ3R*th?4^h->#!&V+%IoPFiwx|od}6(vCip5Z
z8Q-iXEUl}OC-rREseS_)pgJoybo;;ja855e_!zDR+m!T}ft+KeU7!O^(%sOp+v;6a
zoG&7$Y?C*){wrEgrN!8+C>|-GtXVoKi9so33L%gHCa}N^umJ{nFby2g1s;+o1VkW#
zFtJi3lO-7hbYKvFgjg5^i4`Y)HS({vwBYHWM6@<ILGBy~J{6X)Sm|4}x@(QQyT`w_
zcis988#iqZ1XpYkHNjsgKtI`!zjB}Q6J>itEuNx0Px+GaCuN|qrqd~JQNE{aUR28`
zDbG;8p!`9(c5zL2l=2$oz>-?r*W`B}*_}ezz+}ayeJ{K<Ql0z1{2}5?2_-Ctqw#>4
z49kJ7@lZ4n8|q62BC;~nAC1Qo{e8)d6pe>PaUxmFlRsm6zce95<xnINQKg`mmPeJ5
zy91dN%I;GSs?i|XQg`JP*G;z6Q@P0W%#QC)Wn%G=6hrAjazG>K1A}0g?D_(@23~=;
z;0u^%nwc(UfKeHXxx(CMo-uEjkIWqNn{8s-SRZ?iz0JO1zjJPG8;7_H+*9rY_s8XT
z?RD9%8?M)`uY3z1;V1dC{3HGy{|mZcBisTr@C-Z`gO}iCcpct^ci>(406vEA;5_`@
Qz<`CrQUays*Y5`S7tVAK7XSbN

literal 3174
zcmds3%W@i55M9S#F=2ma?)#C#a^0t+vLsUmrJPl23}ZCq;ZZQi)+gmR@@4745|+e}
zO0*0sVEXhq-F>=Y_~zT9$!@F7wq7k?4@iy&S+$(5X7zIZdT>2SNDtney&C=;-uub#
zqnNFmdfR5BYj<((vjHj!yIwa{QG`jzMi=MfNd`HJB3=!$!A;w)e<_NuU%%#M7nM&}
zi!N|mj5e!vwQ27zAQ=KcK5J(Kp!uHti5&QLR!`frS3eEERCi}?S2wfEa(YuQtM}vm
zr(w}OfalwG1G3MEbW{j2Ebc$wBYkqa<*cbfbz3#7^`cs~AF4T&{Tv^cb13rW6h3~d
zrn|QM)Kt%bZ!gQbsh4HD+MEKP&w#f6TvrhBR5kP_U#=GGU0dbz#UWAtZ;~!QuLAT4
zYAH8&zkMI(^ZYW$r$k+qi<i_gDyLt{c{RCPAEDh<xH!c&zFBSBdy(V)#GXq9L!1QH
zbLj7GbHw-tUME4j^%^*<*{CVo&#TR1dtfX#o3iuH!8~BC_v4R`GZhapd;dMS=tP&v
zV`MkrF!3<dy6GSIVJ-F%+q`LR7x}a)m-C$banyt`c_^UQ_u5jT%VPl#pc9hcULHfn
z;ax8Uk(S{eT@c@AqD47fZNCwm6MD??5w6V97_sh4zYpyd)L-+}_}AT{Tz;s^S+}Qt
zwZ7Zb^PBcC_WR3lc#!?|XGSq$*=0SwDXS*CDC<14O_S|$+iX*9tIcgS%b(YAH6Fpy
znbzyF@lCn?;jDX#e^}q~gDv+B8a2Clz3j|Vw)H2tBkkSw^?CS_@WF-$t1{`m)6OAE
zu|iykh_rDYITK{$$~q_9Be@5h!GhZq45G5bX#=<@8PX0Lt2m^PPi*{j0S>DFyI@6x
zq)r=zgTWwJYalipStXppBuLI#pI{;c_EIwxE!T)+CXrJ<qU2-}fv_0yV}BhAl{g3*
zC`C{dLEKw~jBpldO^I+p>!f2JpOZu>nkX_x3B;qv$WfY*u~aF~r46B%4_m^li2-^l
zIpPVrYoo$Q;^b&j(MlHj_<~Ik;5bqW#>YJsNc%_-<yb@sB?#U-Na~CZGz5e(cF<2s
zkY>>#<&t;C5lOu6<C7TDW1Ik@WY?E~9Fr6!28L20>L67gju5CFV}l}74DsM3vW`Q!
zDhhB;6gc(P2WN>n>VYK&Ahi~7o@iu=gKubLOz>Vl;{=OFAZ)sRTI*nR$sieM(oQ*v
zS+7oPIAk^nQAWBVX+V}rc&999S~73UV}l?3f;lXX#})~iAR5FWqm4u!JCU3gkkt0+
zOfCvXghoPQ3OZ###(NkdmjvdZVBdOuMttBHT#pPF(8VCYX9UC=AG8z#+Ja>tpVrW|
zz&#2~Ltk71s&0><TdX?+(%RIAOJFUjVC0lKn4g78jRc=Xt0U){MyRt77f4KzP>!_h
z`l19uE@6x`hN(gUiN@af!7Y!%8;Z0Fz()<tPjQR{92m`fx4FIjR2~ZgyN41NwwoVA
p4hx20mnBVxd!>4HzVyDl^pO7FaWDO$7#83Eu@8&=|M|05e*-(FsjdJ3