YunoHost/apps
1
0
Fork 0
mirror of https://github.com/YunoHost/apps.git synced 2024-09-03 20:06:07 +02:00
Code Projects Activity

Fix my previous commit /o\

Browse source
This commit is contained in:
Alexandre Aubin 2022-08-03 21:31:17 +02:00
parent 806c4ae1fd
commit bae7463f41
3 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
list_builder.py
View file

@ -195,7 +195,7 @@ def build_catalog():
################################### ###################################
result_dict_with_manifest_v2 = copy.deepcopy(result_dict) result_dict_with_manifest_v2 = copy.deepcopy(result_dict)
for app in result_dict_with_manifest_v2: for app in result_dict_with_manifest_v2.values():
app["manifest"] = convert_v1_manifest_to_v2_for_catalog(app["manifest"]) app["manifest"] = convert_v1_manifest_to_v2_for_catalog(app["manifest"])
os.system("mkdir -p ./builds/default/v3/") os.system("mkdir -p ./builds/default/v3/")

9
tools/packaging_v2/convert_app_to_packaging_v2.py
View file

@ -37,8 +37,13 @@ def _convert_v1_manifest_to_v2(app_path):
"ram.runtime": "50M" "ram.runtime": "50M"
} }
maintainer = manifest.get("maintainer", {}).get("name") maintainers = manifest.get("maintainer", {})
manifest["maintainers"] = [maintainer] if maintainer else [] if isinstance(maintainers, list):
maintainers = [m['name'] for m in maintainers]
else:
maintainers = [maintainers["name"]] if maintainers.get("name") else []
manifest["maintainers"] = maintainers
install_questions = manifest["arguments"]["install"] install_questions = manifest["arguments"]["install"]
manifest["install"] = {} manifest["install"] = {}

9
tools/packaging_v2/convert_v1_manifest_to_v2_for_catalog.py
View file

@ -24,8 +24,13 @@ def convert_v1_manifest_to_v2_for_catalog(manifest):
"ram": {"build": "50M", "runtime": "10M"} "ram": {"build": "50M", "runtime": "10M"}
} }
maintainer = manifest.get("maintainer", {}).get("name") maintainers = manifest.get("maintainer", {})
manifest["maintainers"] = [maintainer] if maintainer else [] if isinstance(maintainers, list):
maintainers = [m['name'] for m in maintainers]
else:
maintainers = [maintainers["name"]] if maintainers.get("name") else []
manifest["maintainers"] = maintainers
install_questions = manifest["arguments"]["install"] install_questions = manifest["arguments"]["install"]