[Git][gajim/gajim][master] imprv: Disable plugin updates by Gajim on flatpak

[@lovetox]

Philipp Hörist pushed to branch master at gajim / gajim


Commits:
0fd5aa54 by André Apitzsch at 2022-06-20T18:17:18+02:00
imprv: Disable plugin updates by Gajim on flatpak

There is no way for Gajim to update the plugins. Let flatpak handle this.

- - - - -


4 changed files:

- + flatpak/app-overrides.json
- flatpak/org.gajim.Gajim.Devel.yaml
- flatpak/org.gajim.Gajim.yaml
- gajim/common/settings.py


Changes:

=====================================
flatpak/app-overrides.json
=====================================
@@ -0,0 +1,5 @@
+{
+       "plugins_update_check": false,
+       "plugins_auto_update": false,
+       "plugins_repository_enabled": false
+}


=====================================
flatpak/org.gajim.Gajim.Devel.yaml
=====================================
@@ -317,11 +317,14 @@ modules:
     build-commands:
       - pip3 install .
       - touch /app/share/run-as-flatpak
+      - cp -t ${FLATPAK_DEST} app-overrides.json
       - echo -e '#!/bin/sh\ngajim --gapplication-app-id=org.gajim.Gajim.Devel 
"$@"' > /app/bin/gajim-devel
       - chmod 755 /app/bin/gajim-devel
     sources:
       - type: git
         url: https://dev.gajim.org/gajim/gajim.git
+      - type: file
+        path: app-overrides.json
       - type: shell
         commands:
           - sed -i 
"s+<id>org.gajim.Gajim</id>+<id>org.gajim.Gajim.Devel</id>+" 
data/org.gajim.Gajim.appdata.xml.in


=====================================
flatpak/org.gajim.Gajim.yaml
=====================================
@@ -311,9 +311,12 @@ modules:
     build-commands:
       - pip3 install .
       - touch /app/share/run-as-flatpak
+      - cp -t ${FLATPAK_DEST} app-overrides.json
     sources:
       - type: git
         url: https://dev.gajim.org/gajim/gajim.git
         tag: 1.4.4
+      - type: file
+        path: app-overrides.json
     post-install:
       - install -d /app/plugins


=====================================
gajim/common/settings.py
=====================================
@@ -106,7 +106,10 @@
 _CallbackDict = dict[tuple[str, Optional[str], Optional[JID]],
                      list[weakref.WeakMethod[_SignalCallable]]]
 
-OVERRIDES_PATH = Path('/etc/gajim/app-overrides.json')
+if app.is_flatpak():
+    OVERRIDES_PATH = Path('/app/app-overrides.json')
+else:
+    OVERRIDES_PATH = Path('/etc/gajim/app-overrides.json')
 
 
 class Settings:



View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/0fd5aa540366a1fc289c5e77e527c5b97c33b6d7

-- 
View it on GitLab: 
https://dev.gajim.org/gajim/gajim/-/commit/0fd5aa540366a1fc289c5e77e527c5b97c33b6d7
You're receiving this email because of your account on dev.gajim.org.



_______________________________________________
Commits mailing list
Commits@gajim.org
https://lists.gajim.org/cgi-bin/listinfo/commits