From 429641a6fc5ec70608a0f823ac65f2b2891b9b4d Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Wed, 30 Mar 2016 08:08:20 +0000 Subject: [PATCH] Update script base to `m2` --- source/net/filebot/Settings.properties | 4 ++-- source/net/filebot/cli/ScriptSource.java | 4 ++-- source/net/filebot/cli/bundle.cer | Bin 747 -> 0 bytes source/net/filebot/cli/repository.cer | Bin 0 -> 747 bytes 4 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 source/net/filebot/cli/bundle.cer create mode 100644 source/net/filebot/cli/repository.cer diff --git a/source/net/filebot/Settings.properties b/source/net/filebot/Settings.properties index c4ffa6dd..c6640ab8 100644 --- a/source/net/filebot/Settings.properties +++ b/source/net/filebot/Settings.properties @@ -8,8 +8,8 @@ update.url: https://app.filebot.net/update.xml donate.url: https://app.filebot.net/donate.php # base URL for resolving script resources -github.stable: https://raw.githubusercontent.com/filebot/scripts/m1/ -github.master: https://raw.githubusercontent.com/filebot/scripts/devel/ +github.stable: https://raw.githubusercontent.com/filebot/scripts/m2/ +github.master: https://raw.githubusercontent.com/filebot/scripts/master/ # native links link.mas: macappstore://itunes.apple.com/app/id905384638 diff --git a/source/net/filebot/cli/ScriptSource.java b/source/net/filebot/cli/ScriptSource.java index c580271c..b9318bad 100644 --- a/source/net/filebot/cli/ScriptSource.java +++ b/source/net/filebot/cli/ScriptSource.java @@ -110,9 +110,9 @@ public enum ScriptSource { private static ScriptProvider getScriptBundle(ScriptSource source, String branch, Duration expirationTime) throws Exception { Cache cache = Cache.getCache(source.name(), CacheType.Persistent); - byte[] bytes = cache.bytes("bundle.jar", f -> new URL(getApplicationProperty(branch) + f)).expire(expirationTime).get(); + byte[] bytes = cache.bytes("repository.jar", f -> new URL(getApplicationProperty(branch) + f)).expire(expirationTime).get(); - return new ScriptBundle(bytes, source.getClass().getResourceAsStream("bundle.cer")); + return new ScriptBundle(bytes, source.getClass().getResourceAsStream("repository.cer")); } } diff --git a/source/net/filebot/cli/bundle.cer b/source/net/filebot/cli/bundle.cer deleted file mode 100644 index d6d09b4dea1386e523b43a2b6820c1cd8bb97759..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 747 zcmXqLVtQ`S#CU!IGZP~d6HAd7<3|HtHcqWJkGAi;jEvl@3Q*_F}%7X8x=WMT|S<_Q#|wk$T6n@}Z0Bo7PxaOFgr+=Sdm+1@yx@rk%LDGt%&+ zYFgyhP2vI9+Rjed*w&-4EJ5j7R)BrVq+(?;)-@sSYg@PLq?Wxgle%>}?8_ad%*3tS`Z#X=AvJy1+ORt@Ef3d@CMYGa^Ef2Cb`&3qU{u2Ct zx++KfXY37&V?oshF3w?cj0??A9PTRmb~-y)b&lrBg4%Mcqy=vjpNO(>`0Ib0v`NKc zt6=>1yT+Oq?oP;JJEI;@WdCb{|5+wxMh3>kiU#rqvcMRTazyA_BE%J7v1LHW-at>pI)R#!!^rY>sjN=mhO3E zG+VFq-*GMzqMRE z*4bF{@48vIS3a+2Q&q?Ps*u+IRRvG3XWjoG{^;R?12#ujc&m#~I@IY?k^f$#w;U*2?zT=%;TGKnxR~xhvTB| z=>Ug)Wr54HEl(W1_$cjhz)aSE7hNBEO$eR8x}3jtv-r0sHu0{~PrDS(D&N1gGdOIL i!Q4p2osJSrP0=TsG$tKmwPDifeZ6&Fi~3Hl-w^=bKO}Yl diff --git a/source/net/filebot/cli/repository.cer b/source/net/filebot/cli/repository.cer new file mode 100644 index 0000000000000000000000000000000000000000..ed026214684dde7dddf6aadfcd21609ab9be4d49 GIT binary patch literal 747 zcmXqLVtQ`S#CU!IGZP~d6N~3xMMnc(HcqWJkGAi;jEvl@3+tof15VfN^6xAoP+qPrEMno$C? zv%Tfd?RWnwa4l=ihF70Lt(V(2``Yy^?p3_5DqKBrmdT!PK4+)RS+;w5-{yzs=c(V+ z&ll40s&`uwIo)z*a`U#oxBoT9Yen=P4H0qKP^>?PBS^rv=J~k;j>#wQ`|9*>+yA%4 zXmN(pT$9i@Oje6G^ElZS_xl)1O!#aGXM={Wp9|RL z`PVJYt>bkr=BZ}nG)i%r)pc01v52Jj{J;18%IuoG zw*~v}*v$NOyr!cZIS_$y2n<9^owxn0T$NQ4_3Y}sr0X}+dv2dHzpm_P^ml?j>+1twKWEi(zls*x z5}s{gugzii^OqI(?_Hc9=IMPoJ-av2GIz&?{^gzRGuEoCOo({<_}Ap4XLv)Tx%cxL jTIBXAPyTg^|M}LqD^)Fg%EwzAv@PB@pMNKn