From 862f3e6bae01460b08acfd9b1d9d1a54e76be731 Mon Sep 17 00:00:00 2001 From: Ben Soares Date: Thu, 20 Jun 2019 12:53:57 +0100 Subject: [PATCH 1/1] JAL-3323 Improved macOS Old Jalview Uninstaller --- .../Uninstall Old Jalview.app/Contents/Info.plist | 32 +++- .../Contents/MacOS/applet | Bin 60336 -> 24996 bytes .../Contents/Resources/Scripts/main.scpt | Bin 2144 -> 9576 bytes .../Contents/Resources/applet.rsrc | Bin 362 -> 362 bytes .../Contents/Resources/description.rtfd/TXT.rtf | 2 +- .../Contents/_CodeSignature/CodeResources | 177 -------------------- utils/install4j/Uninstall Old Jalview.scpt | Bin 2144 -> 8786 bytes utils/install4j/install4j_template.install4j | 47 ++++-- 8 files changed, 59 insertions(+), 199 deletions(-) delete mode 100644 utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist b/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist index 06399cf..649770d 100644 --- a/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist +++ b/utils/install4j/Uninstall Old Jalview.app/Contents/Info.plist @@ -11,11 +11,11 @@ CFBundleIconFile applet CFBundleIdentifier - com.apple.ScriptEditor.id.Uninstall-Old-Jalview--optional + com.apple.ScriptEditor.id.Uninstall-Old-Jalview CFBundleInfoDictionaryVersion 6.0 CFBundleName - Uninstall Old Jalview (optional) + Uninstall Old Jalview CFBundlePackageType APPL CFBundleShortVersionString @@ -29,6 +29,28 @@ LSRequiresCarbon + NSAppleEventsUsageDescription + This script needs to control other applications to run. + NSAppleMusicUsageDescription + This script needs access to your music to run. + NSCalendarsUsageDescription + This script needs access to your calendars to run. + NSCameraUsageDescription + This script needs access to your camera to run. + NSContactsUsageDescription + This script needs access to your contacts to run. + NSHomeKitUsageDescription + This script needs access to your HomeKit Home to run. + NSMicrophoneUsageDescription + This script needs access to your microphone to run. + NSPhotoLibraryUsageDescription + This script needs access to your photos to run. + NSRemindersUsageDescription + This script needs access to your reminders to run. + NSSiriUsageDescription + This script needs access to Siri to run. + NSSystemAdministrationUsageDescription + This script needs access to administer this system to run. WindowState bundleDividerCollapsed @@ -36,7 +58,7 @@ bundlePositionOfDivider 0.0 dividerCollapsed - + eventLogLevel 2 name @@ -44,9 +66,9 @@ positionOfDivider 421 savedFrame - 20 1180 700 672 0 0 3360 1867 + 272 342 1754 910 0 0 3360 1867 selectedTab - description + result diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/MacOS/applet b/utils/install4j/Uninstall Old Jalview.app/Contents/MacOS/applet index 05e9c3598fdc6648649b6a5a1bff6ec7ea0aab05..1ace4cac85c4747d123f07a75af00d7f36155b9a 100755 GIT binary patch delta 1068 zcmah|T}V@L6hHUws@t0LZo7Wq*6y86u`HS*XnrewT&N%m(@HbVV1bnQ0TzR%Q)rbj zJxD@5RQM3|qF6m7n4mBpde9yWdkBTBSs^|Mm4)m4Hv{pdKRf6A&hP(m&(}uYYlf$| zKvJq>1^^5saU>dmGBS=~Qiieen%RT_QH)6-PsK!W+~hU_aOCxpu;m_G65}-H8OE`t zL^RBBxM7*MKhNOLzWZGI$ouKl;KWLGvy*m3b|O{}V8m5vfOBJ4Vm{B0;PswLG$ctp zw}EL%N1xvX{uRkMksKf0q1MviS~xW~`D5xfJY|toYWa*k8Z= z_HpoD(fD{x*4i%D!-XAf()Seb9(#Xw64v&ZqOEF(wka(&gPvp^ouTJhGJCiDS!Fc4 zM29c>_T=2v_@;#3$&MfXTBjkTqXT}y8LA_@Ugcl*eb)vLI|bI*px|Up4i(|Tefdn^ z$)7>Wm;-;g;5Rr!EO_5^3iUUf&WaRHS0dU;+Rd^Kr%R**ENNKzN4V*{IiG~>AHpRheXd~h2xdZG>xl!B0SHueh z|99s%ja=G}JFIG%3c!8^tl%P$OY(1J(&Xfj6v^}#{E%QXmo?pJZmMrhN&#rKnaZ#wJ6Ry8V5!T>Iq`z4>7N~}!uhNet6R9oP TgWK?tC}uMQ$G0%%W(WQPzdQ5L literal 60336 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 OMF2$rMc|)D;Qs-^9E3;! diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/Scripts/main.scpt b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/Scripts/main.scpt index 7afbebc99bc154caf19f945e4b020f7aaf54b727..3147d89232642909aa27dd3dc070439687ba0ec8 100644 GIT binary patch literal 9576 zcmeHNd0`9l9~19R@o+%q$0&iv+_ zGjreYAYD3o=xMRT3Jx2nDFUEP2N5`Mk>fA}!@N_;di`tTq7C2dgIq(BlVBcbi?;Hk z{L3)orYu`q?2C4WBiYZgJC>OUGq6sJ<=QqD1L z^&U_cVOeLJ#8j5@F`T&?YC-jr&(w=a%R6f(j#RjQE(dVY5&Ibui=%zH;GN_j@^^zy zA&#_We;i;)EG~#C`QDT7v9CWRnXD}f5@~}28uj)!U;c*v1JS9;Y^b+*T}3*R-l>*z zEV8wZ{6ls4ch%v3Or6oikXV6KYX{1A@>hccLxHsBC+KQOtU&Fl?t>yYNEOvBif(QU z#Z-x^U}pftnyH}?wlS(GN#Mi?@kRxz(qgPtps1?jd>c@m3CpQUZwmbw`s@YF`=Wpw z&BJl*GsdOVQ5BK_H;#@L*s+rh^U%5!7e3r%F>-6G=Ce~tbxw`_&9ME3y3nm!Y5UHw zc6YGo&)TW>UC5E0`R+E?VbODN0vh(6te--}>?``V2(JWTJFhkf^PQ&!|df%5+oOy5qyT zk;#nRsE&N6SpBPFwF}cv(cO?(tmYBDG5L%9*-#E^gtg{iS`zK_Riu$ai&;Q1WdQvUpK$bWjb{pA||V+=BQ8ut)^MmC&k=! z=CZt{ESC@!x-%3}x?)Pxq-sbjD2E!-kiS89`Hi~!#+Pr_bY0L*zL3x551xEMM>oA9T@sXJYO87z33YTL3!r&NK4<^( z2Q~YLhO5&F`^#sZd`8oztx9TAfg@k3C|{~5eVF=VfFao-^mf@MpE|N#nYJnUR5=GQ z6`;_NSkCU4h=KBnY&95&oKq;Y)*ObzafIQ+I`(|NI?~0FZ2B|&+>o$oF0FXJY{4%u z$l(L+nL7dl((z0)XA#RJo7V*CSdgd)((I6Cevm@$mr?u@A&Wk~D>$fvS?jlqV*J(BazM?d)(M|&h~Jc>u(adh~mCzo|I zhIk}xyy|panZb|{X}!=}HuOfH|3*GC z_)RGI04~Q+9AilA&K-aP`OuRO8{A$dRTDQjrg5+jeEDE6-JUBSDfkXY&Z*Q4|Kxpn zPu}(9eZn?Km!#sURIDHW!nX^cc}Lz;*uJYRj|h=7h*&z-#j%{hFccXQyAK9ou)Kre z^0voEO99{TaE613jo(J_TLsF9C`LHn(He(dZZIuXpJpCVZG>8cFoaSYGo5hHT3=dO z@@K7!25q7LQmYcDHOg?0guL31hGSE0Z`I6A=2V6=pgR>O;xuxm2(Bu=pJ+oGq(BiYXYZn9bA?#pG)+PVqM)p1_gImT$C2iv+BCRx7F>Z#={ zq<2oU&q53IDV#waQwhr_+ZvtKG2|)bKefyQ_)Y_`VdP3M>6~MfswFKP)kKzja%<3h zB4<8@;|5Iib~M#^ne9ilSi+o!+%0Lp!1@cd=@~n#$_A^R4U&g7tdeSm0lq75s|71! zIu6Gh5(}oIF-|t%1f1yc5rV0d(QA;d49^;bXn1-!0qztQj%E)hVWc5xC?CtH>|{e? zBkZFwMBeh{t-bKPhRU{EaR_yNN(84UP*2skxQ&KVhAVBmJ{H5|O<&$@wPVVqo^#|4 zVr`ViM;lKgbi<+@Z3Iq`^`5Nf#!qJ|N^~#gViX&^j?wa($447)N~Vg2Y&4wX`F12* zp6=pwYH*CKGZ+*0Gm-+2jbN-wJuZrIl)4xvxU!D@$!n_f zkymuTzpB3F6D3=fwUB87CK{3*uIOcXNnUj1Wo3Fv$&1Q4k!cdnFeH|9l5+?q%L}sB zaG$jq&tbIYOa$`0tTD`39kPY2_GR^6S~NqXT4xqG2V;s$?7GBesUfl6Ah6h_Wsir$ z1ehYv`SM(=EPGklh7!xOzC4RA1K~9UY^4>c9rOwN=*d*+u1Cn`QSR<|n#Z6GHqdYct4fvk8DE~k0Rz!46`!80jmH^U zHe`#cN?nGzE{$iEA+alx#GTxf)$+7FWtee?u@4RN&O*wN*lv?Z$&B=3*Ysl}F_f zLj!1s)SB}!+mJYivBjmBCo4Qz!Qm3|s;LIE!%5D?rSh;Z54WHYM;_IE@re4)S>br| zun_0VL$ci9{BS(2xd0a$55K8I{2p_0vByVCCVg&b!WZKKT!Kpti8bkqu>_alazkRpT#S2gMFdyqo|+fs zs*T*uj?%Mh;~BAa=UVmt9(o&G9?tt7+$T$XS<=G14Pj!1T7spRAHjST>dGjtqz-!L z;$oWb`>+64d3rBVQlI_4FF!)Lpw+M9v%J9)lY~&Q*8{H%7SA$azx~H_#$B1 z%bjwEBa0OicPhCr-hJ{hmrz9dQ{HE74+ zuJC~Lq0<$=$NgAp_^>`@6TZg-Ehk3{hZp+?)wm15v$@NhWYE%*YDf@bT{a9Z2(h1}@Ljht3GlRC>_ zWoS;eU^^a@8{~R}$FeQA<8iDqBvw&dv0bk7!YYmfLXJQX1dse-4Yc>2GQKV7l~ z0HcEcpveCkMbx$GrS5M$lU^-X$pTNVCXn`gCcR2qF3^@s!_E35x9>A9Eu)KP@th&C zoApO$AGs2%WxmHpOPh6dh|C`y2Wui&qsV+dis%1}%>PVe&Q~+{9Mf8vXXy15Oir%T zRj$Abc+umdr2ysyYx&6^#Y=eEkZ1tIatFKup0{4fmVNrU*9?hz2EK2H*CTjc!M8q& z^^C`cs#l{mSHns8P6Ti8zfR)KDBh%qy?HmI-yZbtLho<% zIxs7!4jSIVw^qpMwnYu8-WAt}eH*+Sirm4;lgoU$Y%dPuFEZk}6mQ8T9v|7@?5%J% zot)0Xc=h6@!I@m5#%G?A+tn}LrdYX?X@kr)3{y1vabiwP=Ey~Ip(AsY=^`Z;YMZ%A zp4Z|UB`+vht6iMI^tN1J@OBtLX}Ep9%$D;UIbWG(D>+YFU!WJPF3=$lIsC$UF5Y2u z^PbG&H>nZOTE;|45^hGPiCrRjn`(9{7R-5)8L5)3{Lg7 z&zEyrvDm(xy_W}dU+VYb=Eaw~RPu}45xg%odpuc1sNS}DlEH_PmJ~k1 zMmfu4anE`*_%QTK;AO`q7n`_T`(U$+&CGPf$1Xl*rZcvimtezqz zGDQN6l{00soPkQ2Bok$VjOVFozKr8x;YJyYTV#x!E~6P7uaHr48soAxG(vB9l5D|c z`a;X}|9-9ZDcs(DoAo)B)_)!IrLxsX@njmearQ%tCl#FCo<7!iQchE#-wQmM8ivkg zzLd2RX^zBotxCboS<+xqJeksHL|7lNUa#?T|Ae2Jek0pUSN1!{qSJ#5dk|c8C{P^2+w;tG6uPxoX(=2p*%t(JY{(@ia9+-c!WuK z6p6}NPOmM~+QTV&tGKLaL-DqvcZxqNdawBNj%eGD_3cI%cfx-CzU=qa>cXPJqK(Dz zq77qk=vc;Xk#DqJ@!9}+hrD=5z;Afy7+}8uohoYs?B5;-6qk1>UegV0R~Ma$&cy+` z@OfbIWOSa41KV~(KjtO`_{qcx<0~hQXCXk>{(Pm6?uQ3BsF$`Ihn#Y@?Z)>UHR(^mU0eb3)lR<`F{R8gBZWzvweF6Hc4$zl1{rVqb1rBhiKF6S^okf8D z4b=lyvu#0kF5MIC&klaF(hd=xY3UWWMX^nhF^kI2{-U7+-gmAriZ_~KIK1(I)BdEO zq@pU5Oqa(-4Abgnf5!}?QQ+VHqq9F4i8XvXE}&&^#@s?t`)K+)EPJt%nx?gg?iglr z!!X1+h7=yfpH(C(O86}{S(QGj;nh*QFgMmTm9kJhS%3c2W7oUTJ=}BJA7iw~N%a3E zHq6lwC(RHjh7tV!(GkCHDogpr}<4J7&I zPq6Yo@*)2~Fz!3z5*I{KK~!Ahg3Hb6H>41&V!=%H?e5#RyU#s+?|q*}oVM-F-v;Vy z>qENv0C@c(Fkr%CZ~(=z(Mi4jc};k^l7(zV;Yn}|c#tD+^9K`!Pg3S*Z$ zH(>c-!T1w)0c`w^uMj~LadaV#Bph@gfY0y=)}a~Q{3o~;rA?ZBl2#5^wsM|8FEugz z!ufXU^$8BG^hyFh&cY_}j!iB1@1GwC`IA2;w2eAc`1_$z6>i`<43-ta9QypOI}#=0=f3iWU{wCl5iCA zr$IcoyV&VBs(q-|*lP+rGyNsu=zasN$2ZfY`b>G*!8 z#Zzrs$X17tqHu$p)^bBesr?E6QS|uqK1Cfqq=D<-#m-&XlW~kRdIu zX)&y+X<%C`=M~mYlXy^l7py_1F~QKLbdFZe(96F zwj7%Ufwml-V<=d1WU5Hoa(I>{&X7YI|3MJ+fvG&SWdB>4XAycP-8{07Bk6xn*|4OK zCOT#;+54WTE07at8E!otZf_k37r`GK>8ooU498jrzC-a2{mma8yFGrVv-d7Pbm0zv ixW5#I!HK@QLgWO0&VzsZ_waQ1q3a=IUri1T{qZkQKT4kf diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.rsrc b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/applet.rsrc index cf9920e4979e3f9779c9bae62d0b2bb59ea95928..8e05928d692d0ce4b8d2f26942ba9a4e79e25ae9 100644 GIT binary patch delta 35 mcmaFG^onVN2_suCBLjm7(_||~1p!WG1|azVA4te?0oeeQSO%K_ delta 35 mcmaFG^onVN2_qXn0|SFP!(=N)1p!tdlY!y?e;^^p1|$H7_XZyT diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf index 76ac711..5f23fc5 100644 --- a/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf +++ b/utils/install4j/Uninstall Old Jalview.app/Contents/Resources/description.rtfd/TXT.rtf @@ -1,4 +1,4 @@ -{\rtf1\ansi\ansicpg1252\cocoartf1561\cocoasubrtf600 +{\rtf1\ansi\ansicpg1252\cocoartf1671\cocoasubrtf500 {\fonttbl} {\colortbl;\red255\green255\blue255;} {\*\expandedcolortbl;;} diff --git a/utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources b/utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources deleted file mode 100644 index 9e97319..0000000 --- a/utils/install4j/Uninstall Old Jalview.app/Contents/_CodeSignature/CodeResources +++ /dev/null @@ -1,177 +0,0 @@ - - - - - files - - Resources/Scripts/main.scpt - - fqUypmAyNT7kgykBjNqtdjMM1Mg= - - Resources/applet.icns - - vIRz6m6+ZxDNfi4iTsXj5rdcZUA= - - Resources/applet.rsrc - - aTN+E9yPFzj2wRwcmefcTGGpQYM= - - Resources/description.rtfd/TXT.rtf - - O79gUM5bdy3TK5k10nzhees3tLA= - - - files2 - - Resources/Scripts/main.scpt - - hash - - fqUypmAyNT7kgykBjNqtdjMM1Mg= - - hash2 - - EQiIOT1XOBWGSwXZlfTXIrxNy+61mjRDze6gR+e3c2U= - - - Resources/applet.icns - - hash - - vIRz6m6+ZxDNfi4iTsXj5rdcZUA= - - hash2 - - D7gig1wJlOzR/Iy+y6TESLN0j/cIpjThUyO1pj5fZEc= - - - Resources/applet.rsrc - - hash - - aTN+E9yPFzj2wRwcmefcTGGpQYM= - - hash2 - - fQhBZ0v2JeXFde/OYcgUVYOfUcp426odn5rtdTkcdjc= - - - Resources/description.rtfd/TXT.rtf - - hash - - O79gUM5bdy3TK5k10nzhees3tLA= - - hash2 - - qxVBcYejHswAjMa99pSek5Vgi52JP4dlQMTiIzbCkBs= - - - - rules - - ^Resources/ - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^version.plist$ - - - rules2 - - .*\.dSYM($|/) - - weight - 11 - - ^(.*/)?\.DS_Store$ - - omit - - weight - 2000 - - ^(Frameworks|SharedFrameworks|PlugIns|Plug-ins|XPCServices|Helpers|MacOS|Library/(Automator|Spotlight|LoginItems))/ - - nested - - weight - 10 - - ^.* - - ^Info\.plist$ - - omit - - weight - 20 - - ^PkgInfo$ - - omit - - weight - 20 - - ^Resources/ - - weight - 20 - - ^Resources/.*\.lproj/ - - optional - - weight - 1000 - - ^Resources/.*\.lproj/locversion.plist$ - - omit - - weight - 1100 - - ^Resources/Base\.lproj/ - - weight - 1010 - - ^[^/]+$ - - nested - - weight - 10 - - ^embedded\.provisionprofile$ - - weight - 20 - - ^version\.plist$ - - weight - 20 - - - - diff --git a/utils/install4j/Uninstall Old Jalview.scpt b/utils/install4j/Uninstall Old Jalview.scpt index 7afbebc99bc154caf19f945e4b020f7aaf54b727..3ab3516a3b1e65bf0fecc745a010d09d58a9e7ec 100644 GIT binary patch literal 8786 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 diff --git a/utils/install4j/install4j_template.install4j b/utils/install4j/install4j_template.install4j index bec9829..65261d8 100644 --- a/utils/install4j/install4j_template.install4j +++ b/utils/install4j/install4j_template.install4j @@ -1123,7 +1123,7 @@ return console.askYesNo(message, true); - + jre @@ -1131,84 +1131,99 @@ return console.askYesNo(message, true); - .install4j + jre.jar - dist + .install4j - resource + dist - getdown-launcher.jar + resource - getdown-launcher-old.jar + getdown-launcher.jar - getdown-launcher-new.jar + getdown-launcher-old.jar - *.jarv + getdown-launcher-new.jar - gettingdown.lock + *.jarv - *.log + gettingdown.lock - *.txt + *.log - *_new + *.txt - digest.txt + *_new - digest2.txt + digest.txt - getdown-launcher.jarv + digest2.txt - launcher.log + getdown-launcher.jarv + getdown-launcher-new.jarv + + + + + launcher.log + + + + proxy.txt + + + META-INF + + -- 1.7.10.2