skullbite/cartridges
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Flatpak custom paths

Browse Source
This commit is contained in:
kramo
2023-07-01 11:11:16 +02:00
parent e46c9b6a30
commit 036e5814f3
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/hu.kramo.Cartridges.gschema.xml.in
View File

@@ -68,7 +68,7 @@
<default>true</default> <default>true</default>
</key> </key>
<key name="flatpak-location" type="s"> <key name="flatpak-location" type="s">
<default>"/var/lib/flatpak/exports/"</default> <default>"/var/lib/flatpak/"</default>
</key> </key>
<key name="flatpak-import-launchers" type="b"> <key name="flatpak-import-launchers" type="b">
<default>false</default> <default>false</default>

11
src/importer/sources/flatpak_source.py
View File

@@ -53,6 +53,9 @@ class FlatpakSourceIterator(SourceIterator):
) )
for entry in (self.source.data_location["applications"]).iterdir(): for entry in (self.source.data_location["applications"]).iterdir():
if entry.suffix != ".desktop":
continue
keyfile = GLib.KeyFile.new() keyfile = GLib.KeyFile.new()
try: try:
@@ -118,11 +121,11 @@ class FlatpakSource(Source):
data_location = Location( data_location = Location(
schema_key="flatpak-location", schema_key="flatpak-location",
candidates=( candidates=(
"/var/lib/flatpak/exports/", "/var/lib/flatpak/",
shared.data_dir / "flatpak" / "exports", shared.data_dir / "flatpak",
), ),
paths={ paths={
"applications": (True, "share/applications"), "applications": (True, "exports/share/applications"),
"icons": (True, "share/icons"), "icons": (True, "exports/share/icons"),
}, },
) )