kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 11:00:10 +01:00
Code Activity

Merge branch 'master' into logging

Browse Source
This commit is contained in:
Daniel Martí 2014-01-31 09:14:03 +01:00
commit 8b26f4b319
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -9,4 +9,4 @@ assist in creating, testing and submitting metadata to the main repository.
For documentation, please see the docs directory. For documentation, please see the docs directory.
Alternatively, visit http://f-droid.org/manual/ Alternatively, visit https://f-droid.org/manual/

2
fdroidserver/update.py
View File

@ -97,7 +97,7 @@ def update_wiki(apps, apks):
wikidata += "This app provides: %s" % ', '.join(app['Summary'].split(',')) wikidata += "This app provides: %s" % ', '.join(app['Summary'].split(','))
wikidata += app['Summary'] wikidata += app['Summary']
wikidata += " - [http://f-droid.org/repository/browse/?fdid=" + app['id'] + " view in repository]\n\n" wikidata += " - [https://f-droid.org/repository/browse/?fdid=" + app['id'] + " view in repository]\n\n"
wikidata += "=Description=\n" wikidata += "=Description=\n"
wikidata += metadata.description_wiki(app['Description']) + "\n" wikidata += metadata.description_wiki(app['Description']) + "\n"

12
makebuildserver
View File

@ -61,7 +61,7 @@ if not os.path.exists(cachedir):
os.mkdir(cachedir) os.mkdir(cachedir)
cachefiles = [ cachefiles = [
('android-sdk_r22.3-linux.tgz', ('android-sdk_r22.3-linux.tgz',
'http://dl.google.com/android/android-sdk_r22.3-linux.tgz', 'https://dl.google.com/android/android-sdk_r22.3-linux.tgz',
'4077575c98075480e0156c10e48a1521e31c7952768271a206870e6813057f4f'), '4077575c98075480e0156c10e48a1521e31c7952768271a206870e6813057f4f'),
('gradle-1.4-bin.zip', ('gradle-1.4-bin.zip',
'http://services.gradle.org/distributions/gradle-1.4-bin.zip', 'http://services.gradle.org/distributions/gradle-1.4-bin.zip',
@ -82,24 +82,24 @@ cachefiles = [
'http://services.gradle.org/distributions/gradle-1.10-bin.zip', 'http://services.gradle.org/distributions/gradle-1.10-bin.zip',
'6e6db4fc595f27ceda059d23693b6f6848583950606112b37dfd0e97a0a0a4fe'), '6e6db4fc595f27ceda059d23693b6f6848583950606112b37dfd0e97a0a0a4fe'),
('Kivy-1.7.2.tar.gz', ('Kivy-1.7.2.tar.gz',
'http://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz', 'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
'0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1') '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1')
] ]
if config['arch64']: if config['arch64']:
cachefiles.extend([ cachefiles.extend([
('android-ndk-r9b-linux-x86_64.tar.bz2', ('android-ndk-r9b-linux-x86_64.tar.bz2',
'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2', 'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
'8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'), '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
('android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2', ('android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2', 'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')]) 'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')])
else: else:
cachefiles.extend([ cachefiles.extend([
('android-ndk-r9b-linux-x86.tar.bz2', ('android-ndk-r9b-linux-x86.tar.bz2',
'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2', 'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2',
'748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'), '748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'),
('android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2', ('android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
'http://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2', 'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
'606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')]) '606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')])
wanted = [] wanted = []

2
wp-fdroid/wp-fdroid.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* /*
Plugin Name: WP FDroid Plugin Name: WP FDroid
Plugin URI: http://f-droid.org/repository Plugin URI: https://f-droid.org/repository
Description: An FDroid repository browser Description: An FDroid repository browser
Author: Ciaran Gultnieks Author: Ciaran Gultnieks
Version: 0.01 Version: 0.01