ubuntu fixes

xkb
sezanzeb 4 years ago committed by sezanzeb
parent 51b6ccfebf
commit 3e0428ca29

@ -2,5 +2,5 @@ Package: key-mapper
Version: 0.1.0
Architecture: all
Maintainer: Sezanzeb <proxima@hip70890b.de>
Depends: python3, python3-setuptools, python3-evdev, python3-dbus
Depends: build-essential, libpython3-dev, libdbus-1-dev, python3, python3-setuptools, python3-evdev, python3-dbus, python3-gi
Description: A tool to change the mapping of your input device buttons

@ -153,7 +153,7 @@ class _Config:
with open(CONFIG_PATH, 'w') as file:
json.dump(self._config, file, indent=4)
logger.info('Saved config to %s', CONFIG_PATH)
shutil.chown(CONFIG_PATH, os.getlogin(), os.getlogin())
shutil.chown(CONFIG_PATH, USER, USER)
file.write('\n')

@ -27,13 +27,14 @@ import grp
import getpass
from keymapper.logger import logger
from keymapper.paths import USER
def can_read_devices():
"""If the people ever looks into the console, make sure to help them."""
is_root = getpass.getuser() == 'root'
is_in_input_group = os.getlogin() in grp.getgrnam('input').gr_mem
is_in_plugdev_group = os.getlogin() in grp.getgrnam('plugdev').gr_mem
is_in_input_group = USER in grp.getgrnam('input').gr_mem
is_in_plugdev_group = USER in grp.getgrnam('plugdev').gr_mem
def warn(group):
logger.warning(

@ -28,7 +28,17 @@ import shutil
from keymapper.logger import logger
CONFIG = os.path.join('/home', os.getlogin(), '.config/key-mapper')
# try to find the user who called sudo
try:
USER = os.getlogin()
except OSError:
# failed in some ubuntu installations
USER = os.environ['USER']
if USER == 'root':
USER = os.envron.get('SUDO_USER', USER)
CONFIG = os.path.join('/home', USER, '.config/key-mapper')
def touch(path, log=True):
@ -42,7 +52,7 @@ def touch(path, log=True):
mkdir(os.path.dirname(path), log=False)
os.mknod(path)
shutil.chown(path, os.getlogin(), os.getlogin())
shutil.chown(path, USER, USER)
def mkdir(path, log=True):
@ -59,7 +69,7 @@ def mkdir(path, log=True):
mkdir(base, log=False)
os.makedirs(path)
shutil.chown(path, os.getlogin(), os.getlogin())
shutil.chown(path, USER, USER)
def get_config_path(device=None, preset=None):

@ -24,6 +24,7 @@ import grp
import unittest
from keymapper.dev.permissions import can_read_devices
from keymapper.paths import USER
class TestPermissions(unittest.TestCase):
@ -44,7 +45,7 @@ class TestPermissions(unittest.TestCase):
def test_can_access(self):
class Grnam:
def __init__(self, group):
self.gr_mem = [os.getlogin()]
self.gr_mem = [USER]
grp.getgrnam = Grnam
self.assertTrue(can_read_devices())

Loading…
Cancel
Save