erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-12 00:47:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(linux): Fix restarting ibus when running with sudo

Browse source 
When installing in the shared area the user has to run
`km-package-install` with sudo so that he has sufficient permissions.
In that case we have to do extra work to restart ibus for the
logged-in user instead of root.

Fixes #5309. Partial cherry-pick of #5371.

(cherry picked from commit 0a2dd29e53)
This commit is contained in:
Eberhard Beilharz 2021-06-25 18:49:41 +02:00
parent 59e0cd3992
commit cf03a2b2e0
No known key found for this signature in database
GPG key ID: 64A39A9E98B53105
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
linux/keyman-config/keyman_config/ibus_util.py
View file

@ -1,5 +1,6 @@
#!/usr/bin/python3
import os
import gi
import logging
import subprocess
@ -66,15 +67,21 @@ def restart_ibus_subp():
def restart_ibus(bus=None):
try:
if not bus:
bus = get_ibus_bus()
logging.info("restarting IBus")
bus.exit(True)
bus.destroy()
except Exception as e:
logging.warning("Failed to restart IBus")
logging.warning(e)
realuser = os.environ.get('SUDO_USER')
if realuser:
# we have been called with `sudo`. Restart ibus for the real user.
logging.info('restarting IBus by subprocess for user %s', realuser)
subprocess.run(['sudo', '-u', realuser, 'ibus', 'restart'])
else:
try:
if not bus:
bus = get_ibus_bus()
logging.info("restarting IBus")
bus.exit(True)
bus.destroy()
except Exception as e:
logging.warning("Failed to restart IBus")
logging.warning(e)
def bus_has_engine(bus, name):