mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-11-08 08:20:28 +03:00
Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver
This commit is contained in:
commit
ed78943692
3 changed files with 7 additions and 4 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
|
|
||||||
%w{ant ant-contrib autoconf bison libtool libssl libssl-dev maven javacc python git-core mercurial subversion bzr git-svn make perlmagick}.each do |pkg|
|
%w{ant ant-contrib autoconf bison libtool libssl1.0.0 libssl-dev maven javacc python git-core mercurial subversion bzr git-svn make perlmagick zip}.each do |pkg|
|
||||||
package pkg do
|
package pkg do
|
||||||
action :install
|
action :install
|
||||||
end
|
end
|
||||||
|
|
|
||||||
|
|
@ -168,8 +168,11 @@ def update_wiki(apps, apks, verbose=False):
|
||||||
print "Checking " + pagename
|
print "Checking " + pagename
|
||||||
if not pagename in existingpages:
|
if not pagename in existingpages:
|
||||||
print "Creating page " + pagename
|
print "Creating page " + pagename
|
||||||
newpage = site.Pages[pagename]
|
try:
|
||||||
newpage.save(text, summary='Auto-created')
|
newpage = site.Pages[pagename]
|
||||||
|
newpage.save(text, summary='Auto-created')
|
||||||
|
except:
|
||||||
|
print "...FAILED to create page"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -294,7 +294,7 @@ class FDroid
|
||||||
|
|
||||||
$out.="<p><b>NOTE:</b> Although APK downloads are available below to give ";
|
$out.="<p><b>NOTE:</b> Although APK downloads are available below to give ";
|
||||||
$out.="you the choice, you should be aware that by installing that way you ";
|
$out.="you the choice, you should be aware that by installing that way you ";
|
||||||
$out.="will not receieve update notifications, and it's a less secure way ";
|
$out.="will not receive update notifications, and it's a less secure way ";
|
||||||
$out.="to download, especially if you are not currently using HTTPS. ";
|
$out.="to download, especially if you are not currently using HTTPS. ";
|
||||||
$out.="We recommend that you install the F-Droid client and use that.</p>";
|
$out.="We recommend that you install the F-Droid client and use that.</p>";
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue