From fc398bf9e9b67f750f0f1971f38a49a45765c690 Mon Sep 17 00:00:00 2001 From: Stonewall Jackson Date: Sun, 21 May 2023 18:35:21 -0400 Subject: linux_desktop: use gajim from repos --- roles/linux_desktop/files/usr/local/bin/gajim | 21 +++++++++++++++++++++ roles/linux_desktop/tasks/gajim.yml | 15 +++++++++++++++ roles/linux_desktop/tasks/main.yml | 4 ++++ roles/linux_desktop/vars/main.yml | 2 -- 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100755 roles/linux_desktop/files/usr/local/bin/gajim create mode 100644 roles/linux_desktop/tasks/gajim.yml diff --git a/roles/linux_desktop/files/usr/local/bin/gajim b/roles/linux_desktop/files/usr/local/bin/gajim new file mode 100755 index 0000000..253be9b --- /dev/null +++ b/roles/linux_desktop/files/usr/local/bin/gajim @@ -0,0 +1,21 @@ +#! /usr/bin/python3 +# -*- coding: utf-8 -*- + +import sys + +sys.path = [ + '/usr/lib64/python39.zip', + '/usr/lib64/python3.9', + '/usr/lib64/python3.9/lib-dynload', + '/usr/local/lib64/python3.9/site-packages', + '/usr/local/lib/python3.9/site-packages', + '/usr/lib64/python3.9/site-packages', + '/usr/lib/python3.9/site-packages' +] + +import re +from gajim.gajim import main + +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/roles/linux_desktop/tasks/gajim.yml b/roles/linux_desktop/tasks/gajim.yml new file mode 100644 index 0000000..63f578c --- /dev/null +++ b/roles/linux_desktop/tasks/gajim.yml @@ -0,0 +1,15 @@ +- name: install gajim + dnf: + name: gajim + state: present + +- name: install axolotl + pip: + name: python-axolotl + state: present + +- name: override gajim launch script + copy: + src: usr/local/bin/gajim + dest: /usr/local/bin/gajim + mode: 0555 diff --git a/roles/linux_desktop/tasks/main.yml b/roles/linux_desktop/tasks/main.yml index ac7de3c..87a07c8 100644 --- a/roles/linux_desktop/tasks/main.yml +++ b/roles/linux_desktop/tasks/main.yml @@ -82,4 +82,8 @@ regexp: org\.freedesktop\.impl\.portal\.Notification; replace: '' +- import_tasks: gajim.yml + tags: gajim + - import_tasks: freeipa.yml + tags: freeipa diff --git a/roles/linux_desktop/vars/main.yml b/roles/linux_desktop/vars/main.yml index 0e557b5..977c4cc 100644 --- a/roles/linux_desktop/vars/main.yml +++ b/roles/linux_desktop/vars/main.yml @@ -47,8 +47,6 @@ linux_desktop_flatpaks: - org.gnome.EasyTAG - com.makemkv.MakeMKV - org.gnucash.GnuCash - - org.gajim.Gajim - - org.gajim.Gajim.Plugin.omemo linux_desktop_flatpak_overrides: org.gnome.EasyTAG: --filesystem=host -- cgit