Commit 02b5bbc5 authored by Philipp Hörist's avatar Philipp Hörist
Browse files

fix: Plugins: Change manifest.json name

The current name conflicts with Flatpak
parent fab2cc97
......@@ -96,7 +96,7 @@ def get_remote_url(self, repository_url: str) -> str:
@classmethod
def from_path(cls, path: Path) -> PluginManifest:
manifest_path = path / 'manifest.json'
manifest_path = path / 'plugin-manifest.json'
if not manifest_path.exists():
manifest_path = path / 'manifest.ini'
if not manifest_path.exists():
......@@ -108,7 +108,7 @@ def from_path(cls, path: Path) -> PluginManifest:
if manifest_path.name == 'manifest.ini':
return cls.from_manifest_ini(manifest_path)
if manifest_path.name == 'manifest.json':
if manifest_path.name == 'plugin-manifest.json':
with manifest_path.open() as f:
try:
manifest = json.load(f)
......@@ -725,7 +725,7 @@ def install_from_zip(self,
raise PluginsystemError(_('Archive is malformed'))
if filename.endswith('/') and filename.find('/', 0, -1) < 0:
dirs.append(filename.strip('/'))
if 'manifest.json' in filename.split('/')[1]:
if 'plugin-manifest.json' in filename.split('/')[1]:
manifest = True
if not manifest:
return None
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment