From 48449c118705f7ab9214ff749c82b67474737a96 Mon Sep 17 00:00:00 2001 From: rednoah Date: Mon, 6 Mar 2017 07:36:35 +0000 Subject: [PATCH] Don't use fatjar in MWS build to help with incremental auto-updates --- installer/appx/filebot.exe | Bin 51136 -> 51136 bytes installer/appx/filebot.l4j.xml | 2 +- installer/appx/filebot.launcher.exe | Bin 53696 -> 53696 bytes installer/appx/filebot.launcher.l4j.xml | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/installer/appx/filebot.exe b/installer/appx/filebot.exe index 01c7e5761a506e6eef5007c127433fc99f7377db..05a0b7c08775509f122b4a1b772cc667e2e35a95 100644 GIT binary patch delta 1411 zcmX@m&wQYtc|r%1gy6(3Kc*(ViMNaxXKdzWv}OcSo=m%QnZyMrvlXa;D7^wTDRIHQ z5e#6!$iTqDz+k}y;Q^)d3dAs^BM{Q_3eqs7GZ4~pg_ycK5Ym2Fq*oxM>##_lKuE8{ zBK-m(eGiK?2Q%Dbd_`g)@2eH1)eA!e!6Z)}BLmb7Fkb-3hiU@zMSy%(B=s_A>J@-| zBP96{Aio%ie*(xiMdCB$Gx9NHAPHn_mMp$+C8X*a;p*ZUq#BcxnG~a?mz7wwnQ7fO z#z`9r6%w*y*_f1Bf5uk&MrY@wT{zAsrY>x^;8mB>8`jq2F&8#Z-0)PeKF@Kt_hfO` zDL-7QN*KaUq;W1Y^0?c-FeU#2i>~XdplSnNHcqWJkGAi;jEsz|3@lAd3>o2(X+M7$ zbj+7DTJWe$Bv^c_g>oXt<9%NzJinW!qx;@0yGQ1v|Dla1f9{WQsJ=eUFxM{l6r0=J zI~5bpJUM!Bb3R+X=eGl;hw8q@Pp+S|rhT#IB>u3IMuq&ci@U!ww_R-f@yKW2lyA4~ z7ft;o@;jF4!Q4ejO3@9w^jbIaGl($?%#feJ*nWG4$D7F#w)a949j46UIq%^?Z;joS@~h*bGC!u_NDDQ+R=3K=^7dTYcp?j`KK zC$B8QWp>T8rpWb`&8O?T3ia=8)H)*&Jz<5$(vwVr;;r*?RO*i3Vm)178_s>x_}pu~ z{lB;-hR)2MCOg$)$#(h7O~1rTPK13`EtdJlDgB=9n@r83RWk~CCs$nku(iiNo=FR2)e~N9EqmB2$^qOsc z@9q4Z`|h+IdoXk5EeAuRQYG+}zmI*fh#OAD%)uSqzm}6#kiP_q_Fileh1P z{`4n0;klO28p9){3e(fv zo~w?kGM%;iE1x9@ocQ)J+GmtAMj&Usts z^kNg1P5yg~Gwq@`yt?T5oL8-v;nRlHt!q-J$E9uJQ@LW^aNmNfB2Vn?4Oy89ZyT0L zosRvnxUzoXVwG13rYYzDOI$KucuYBURkUW+(I2p78%}^V_)`n=5knRjfR8=6;I5jKUnL1IxFSCrkafa>-%;S>dB) veq}o+Ug2?DynM4p*^D(@JC1*mS6Ee}87HXQGv&XX*v)XJ?`$hML75o>z`(-5V8I080j2W_#4w~I5YqDs(lDem5Ylpmn7TU<(tcQ^S0JS8ut=XkNUy^p z{Q@C<4~sMhGu&f*MPeZDs}-fyb3p{bBugG61Jn#Kp99E;Y6A0lfP7XY^&)8MC4hV* zBzYeozZi*s0LV8*;{V8F`@x_I+>85#=+j6-L^fyo3@Kmr~`(DI9_N|LV;x1Qv zRlj4MYALhI#9WB?{Xxq`Z_dj195LW!Y8 zEns&;Y0d2$8}klXGP(XgRj;+w^P9=+1Yzd<*yWExkJ%krn=kHo{bWS@T6VoR8S2{C z>aVg$FDTaDrTkLzpTyKByXU^2d);%@;A7QPZTDL;&*p6S^8JY%TP4%hg-=Y9w2TsV zzAC@OAEy}pyma5(t(Q)UrM`b3@pp;EKbD@WM*B)?XZ`T~Bl67j^e!R3UDB&_wfcEh z@VNIXGA^1_+!ZaIbzphc$|}o$J@0k5>@Gc4@7(#?4tN-ILFY634n0NAJ=9FZPg!an2s}eM>%N5ICohkEc>(1A@ANUT6t4&k*<+LOF zFPBZq`ZmA?1@E8&7Qjs?pS*9)v^WOWm=c0#XoB~&th`b%g zKD++Jq0lS$4i{|5jw`>Eb#{H}jz8(O>iT;P`5l+(jS>ES6)?3tejc*f9Ip> zju}TS=Cfy=$k+P1#dVSWTHcBPpES0gff~!jrYig{-0;0?qVk3Wo!9z`4}Mx1MY85? stNvuEa{Sb%Q;uAZJ=Ptc{chGr+ufP!6GT6YUQs_~F_rD+O;A1t0Ck@Y;{X5v diff --git a/installer/appx/filebot.l4j.xml b/installer/appx/filebot.l4j.xml index e2ea5d40..d7be8368 100644 --- a/installer/appx/filebot.l4j.xml +++ b/installer/appx/filebot.l4j.xml @@ -16,7 +16,7 @@ ..\icons\shortcut.ico net.filebot.Main - lib\*.jar + %EXEDIR%\lib\*.jar jre diff --git a/installer/appx/filebot.launcher.exe b/installer/appx/filebot.launcher.exe index e6792acb10c310917b900dfea614b3a875f6d85a..2c00036e0b7e249a87af5f2dbd3c1b4b8e549c8f 100644 GIT binary patch delta 1411 zcmX@GnEAkB<_R548iEtM{FsghO}u5qIAb#}qctOt@?_dw4wRY9R;31_^s3aPGz9lX zFn|Fg0|N^Kg9Q_W2b9jM62p*=KuFK4O2d%OKuF6~W9sfeNc&-tUV)IV!y&0rFXq)XSi$R{-*j zkmN&v{9+{j2_WATiO*2a$j6X@B#^OLvi81}kg98htBYrlYD`XMQjC^fR$|d+rXAlH zC+#X!@Sj@Iwt?HzqW|Z~mQx{>9@AMo%z37@J~7>NjEhs>Z^Gt@yPgWxN2Z+!I~F~4 zdQ{onN5-97Ggl^MNbiVN<}sJqxhQ7C)uRTyY@Awc9&O)w85tQ_8CaT_80yc&wsf3p zdT7_1^n7vl&O_2?OwBYyu0LHFv-{9d@7Z=06Sr*tq+kEWUSauqV}qEMkH0L|--#;8 z&h&M5dpfge@~PCdGaiJ=hO<5^?5IDhJ4+$-MZ)qv9phs+URYRU>|#;ymtHO*YWK_7 ze{I>PulhMVXMCHk92K_Gas9OGv4@SmIy>afidr-Az!mwN{EsVbZt%+{JJohY7kG%feeDzl4FwK5XAvvk3|JP`9Z0d2FE)~bLzL5XtZN@)yte#CT|DWes zuNzWgrruf`d?W4W!~2n~cTx%%bak@bcrG!&oF|jBa;r&n%Gv4N&g^fwAIMC9m;7jw zM2T~!^U1_})%SH9CjC12+w0_y>y|Mg=8Nu0owZ7g6Uk4oIs9BK;r`R5o>GjR@|(kZ z6mOkvUnQB7ep!VvsNR21Rm??SZI0%GCv(2ebgTdAeS4)q#iFV&c5Kr7S*({RXB+9w zTX5jyh8X5u`<^JR*lEn~vw=tGIER+tl7(i|s*HvAf10#_d%@3nvgQ^Z-P1Pi*!{!t zguZ#sa#I^4-O!B}ST5$=nD}GzwXeNboFfi=3%;~r%Dtx2{6B6FP4iD3*SOTY>FUyc z?}zf2cP0FGoNd16^gWlVY?m8Rdj4&P=Ttf#VeJf>SzzrlgT+JE&++^^X5-h5%nK(i zG5zf;Saf#1$jpXkF*PqfPhNTMx4F5osj*pubVI-ufjh)vQ$gvShJRcpIS(ak^sc_-@KT~xUONQz)cwfqS`BuJ1(@*U15k5(c zHJ^4kZaB`r-g#0&+3w8#d2_ilPYCNdGMzpW&N?%TC(FU>-0Y+A33oRi2)|P0@r2vL zMdx}wcih>QolRDjH^q0!C${S!o2KFa{r0k5nR6cOtNdOl5w|6NMd$uGnz!oCD6K8| z6y(0=<>#jhJGUDvy-yAl+xMbHY5y_1V+X%K{bAWv$DqmkPV(WJKWhsDe{lU>vGv9h sr#+fM%RRj^r^sEYcyZrIIkP0L?4DWwovck9m+cC<&*-tu-V4gi0H!7Y)&Kwi delta 1406 zcmX@GnEAkB<_R54=8O}&{Fu&2PP}ErIAJp{qctOt@?_dw4wRY9R;31_^s3aP%o+Da zFn|Fg0|N^Kg9Q_W2b9jM62p*=KuFK4O2d%OKuF6~W9sfeNc&-tUV)IV!y{-!XBXnjCZ^&-(W#4ca_$*HgjzlQ+zYpSsp>4{Er2 zseec01PiMK*1WV^muys0Z+K=(^ce86acZ@Bw0-AgWMpJzU}<7v(3r%YUZ!xbVG+v= zTQ}Cnt)8xYtG9*}eb3t3o>}D_WN_hp)MfUUb$j^ABn`42%89dh^#x9Slqcq1K4b2y zW|{9hlQdTrG8VsAI4-`n-fDNYj8W8ww0-Yi&y(=}HtT!Oq3VpytN1h`yHEYuG4Z-} zv~jZit`i?(y{>(13)t(mwDyYq2g5CuS4?AeZM~4Of9gSn9Y2m9x;oQ(;|b>IO%HyF z7;=C4sL8GW=SJhN^7*Yom${g)O0P*jHpf9aykOs#si7aEZa!7-bX>(@zM-M7{&x7L zIL5Tyzhw*7-~TIl`WJh*oc=f68z;p7u6;J=RJg~hqbdF!8+f@Hs}svLp3a{lk`&97 zv)gIupPJ*Mmv`@ev3J?zD=+uuJ$JunBi-Ru>2hj-tiPo->B&?pwhu+Gx9S81@9K^^zW4l3jZ6Ih6(cu($({Mm`YP)ZwUewTu9`fm zPqz%7bc{27-r{{tJC0R%D6IWZq_3P6-N(dw{aj|{v3dV}lhU>8zl9x8n3Z;{DqUjR zeR1z84=0)DTyeOXuKVtIqcG!wTYFzy_0EbDKg4r>zu%w>H$aP^5O@ zw0!4eqo!|#S1$>yJ~(;hx!>kyM&?EaQ3m?(6vD}3sKlaRJA22$WJXqw2!SsG3#XOM zs#3W3kT3I3+kq$M+`QM_OD5kw|FFJbaqJwamb0HO&zbP{=EZdqHIIT^&X-P5~0_a&6C zWVb~(h0YSm;I=CLzS^91zxxl*x8|zp+Z#;IxA@9%tZDchu+!ja?8+j}xm#}Z>Mxmc zrrt;D_Ol!LAH&?T=50Ut?n$1lNa2cOW=sFXRodUoxl@#H$MVfFNu diff --git a/installer/appx/filebot.launcher.l4j.xml b/installer/appx/filebot.launcher.l4j.xml index 0cb593f1..5ca911e7 100644 --- a/installer/appx/filebot.launcher.l4j.xml +++ b/installer/appx/filebot.launcher.l4j.xml @@ -16,7 +16,7 @@ ..\icons\shortcut.ico net.filebot.Main - lib\*.jar + %EXEDIR%\lib\*.jar jre