From 82e1de32f9871e8e02e888779818b09344b7ad87 Mon Sep 17 00:00:00 2001 From: Real-Gecko Date: Fri, 6 Apr 2018 15:29:48 +0600 Subject: [PATCH] Actually fix #141 --- CHANGELOG.md | 3 +++ filemin-updater.bsd.tar.gz | Bin 2552 -> 2550 bytes filemin-updater.tar.gz | Bin 2553 -> 2552 bytes filemin-updater/index.cgi | 2 +- filemin-updater/module.info | 2 +- index.cgi | 2 +- module.info | 2 +- 7 files changed, 7 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f4b7dac..15e62a6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,7 @@ # Change Log +## [2.2.3] - 2018-04-06 +- Actually fix [#141](https://github.com/Real-Gecko/Filemin/issues/141) already. + ## [2.2.2] - 2018-03-13 ### Fixed - Fixed [#141](https://github.com/Real-Gecko/Filemin/issues/141) - updater will keep Filemin flavour in own config. diff --git a/filemin-updater.bsd.tar.gz b/filemin-updater.bsd.tar.gz index 156256b04c3618ce2eb01e6c22da594f1fabb40e..350dcaf7b67d0ce7678244affe16f7d47786911b 100644 GIT binary patch literal 2550 zcmVaw_nD-285n7>R*ShkK_v4L8-apKPG#N9`e_8eQabI+Pxd#4`1 zJ}tZa^PGzLS*K%juE4ohqw=b@{BRh}xoXP2hMg$edEh91vOFQLA}R06u0zL@^RMnc zoISJP8g;5_Uf$JNr^-@JUr#M4TX5?7?85Ser_1LQRV*s3SXOv-aZ%;+qH8P8l&$>n z`l_?#%Zh6b=H(s8Ka=)T)wVGS}egD_G`iplSRNuN?Q-9~i?Yrgo8ZX~( zti1pD*1ZR{4;yYYJgR>5>~2Hjt;bL9H$G{2^1SIu^9^V8-h z&zqm7ohfs?I`}oT$*B{U)65ZBs}}ti*7Z53*>%vked*b$UHcADdt0-)}#8;jNHPLecc8u`S6ozqSWsU=Qj9Hjdb4$->Z0YHfwas$V&*L8vney;9H2CRrAKoe0me$L;yTnyprSO+ zNm)C_-D5}ks5ofG!iuoH`}0nW4eM>bvQ!kYE^1WJiLBI~b2+2khN#naRIUhFv7>aF zZ}GhRRpG}vg{>Udka3)x;D4iP?W8_VC)2K&Y8I@+B3-{)H#O!4_$qOK|IPgpGU4it z#&5p$+T=H(V*LhOQROsdPUMpFL(srU^SVV+HPK^IE*WdadZ|`@;54Ute|Vp0Rd}BJ zs)zyJ9&1ML8r#25TGGXsuf5z(4EE?Dy`J%4^Uj!AA5YM`bziimE>4sG(9Nl2&!f`u z=Y~LLY588!yogD2nx2&lI~{Sqc{9wVgkO>FakTi)sm{ZK*A6a<+0L0;tj`$QzjRvW z;{Ku0wduwYml7s(x@_Nl`_Qd#b{|JPx!d6s_j`A-C5`(2ms2$=e$L{iMIYQ5+3SLN z^}sHf8B)w;T~;pDe|7rtoPLW-_x0R+ZEL?leFZmUQPRAOE^Zzby)Wbo2kLT9%Q9sJ zL!`MO1x|5)x43^1uxG~ z?t>zjB^lBa0BA@Z7lTdUC4Lmg4DEo}XyPUUf<$mkDHBV@a&8jP(2GhLm*b%S)&3ua zF~ht55#TNEe{?l)-2dL2{{i;S{r`LQUoMxueE*j^>VHQN29f}wX6v*XPJ|H@)}TQ7 zDKihT^AN6w?4=zcp%yN#7Dcr2Y6@4|!bdrV`3_MydjN24-2}U;Q`*i89b}t^_%cYy z_l4p|dvmo$pp8c`gIbRhEnw^%M9;B+VzIatlhJEsWZ`JbEM`WzRkfqEzuoUYm<}Y1 zwFac)@?Rd{8}P#KzY1SzfFu7qf;@*xEF@j_aV?BWGzca!0|Mo8EhK=ZTidlUI01sW zUI>OzYAufG5rfd1{!Zs4Kn$3g00|a^079Ovx#Ni-_7mMVYQ$!gM>BIxGa-JW7E(eW z5k?_Tnba53BgxzpE(Edi_DT~>Pq80;LJqLNEXbUO(XGXa5DjDX&Q}huo;vh zXqgo-OkNg5Z6*+mQd=;MMXv`0(5a08)&W9jq2pUm8~H*D%h*l7*;N@Nf~53|vE380 z)}b~{2K-JD4d8}2qw7gvCU4|gN2Db z8+?e}P$u47?Fcy8E;Hz>95vHy4K-I*+*;y=G@}R-STA=1Z)m6z@{zURFk}N_8Cc=j z5I{*p54D3}Z-y-(FJss_+M337HFk5jjpaXU|t9e8R;D;1+9lsOW?J%Pl8Z3L_#ER zXsf~P;=jGY>^bpLduva8dYIkzY}3;R4t=2UBs`H_)~elFPaKV{gB;`_2RX<=4tg#9 M3sh_PhyW-601o93!vFvP literal 2552 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 Op??AF98mB8C;$LJeE0JJ literal 2553 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 PucUtg!h2lR04M+eW@z{3 diff --git a/filemin-updater/index.cgi b/filemin-updater/index.cgi index b09c385..1511f3a 100644 --- a/filemin-updater/index.cgi +++ b/filemin-updater/index.cgi @@ -39,7 +39,7 @@ if($remote_user eq 'root' & $vc) { &error('WHAT???'); } # my $url = "https://github.com/Real-Gecko/filemin/raw/master/distrib/filemin-$remote.$os.wbm.gz"; - my $url = "https://github.com/Real-Gecko/Filemin/releases/download/$version/filemin-$version.$os.$flavour.wbm.gz"; + my $url = "https://github.com/Real-Gecko/Filemin/releases/download/$remote/filemin-$remote.$os.$flavour.wbm.gz"; my $tempfile = transname(); my ($host, $port, $page, $ssl) = &parse_http_url($url); &http_download($host, $port, $page, $tempfile, undef, \&progress_callback, $ssl); diff --git a/filemin-updater/module.info b/filemin-updater/module.info index 352a52e..ceb8e6a 100644 --- a/filemin-updater/module.info +++ b/filemin-updater/module.info @@ -2,5 +2,5 @@ desc=Filemin Updater os_support=*-linux freebsd name=Filemin Updater longdesc=Filemin updater -version=1.0.2 +version=1.0.3 webmin=1 diff --git a/index.cgi b/index.cgi index 2845316..4dc6991 100644 --- a/index.cgi +++ b/index.cgi @@ -41,7 +41,7 @@ if($remote_user eq 'root' & $vc & !$usermin) { } else { my %updater_info = &get_module_info('filemin-updater'); $installed = version->parse($updater_info{'version'}); - $latest = version->parse('1.0.2'); + $latest = version->parse('1.0.3'); if ($installed < $latest) { print "Updating updater
"; $irv = &webmin::install_webmin_module("$module_root_directory/unauthenticated/filemin-updater.tar.gz"); diff --git a/module.info b/module.info index ada6eb9..abf57e7 100644 --- a/module.info +++ b/module.info @@ -2,7 +2,7 @@ desc=Filemin File Manager os_support=*-linux freebsd name=Filemin longdesc=Fast and light file manager written in perl -version=2.2.2 +version=2.2.3 webmin=1 usermin=1 flavour=full