Archives/input-remapper
2
0
Fork 0
mirror of https://github.com/sezanzeb/input-remapper synced 2024-11-18 03:25:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

possibly fixed the data path

Browse Source
This commit is contained in:
sezanzeb 2020-12-03 18:29:46 +01:00 committed by sezanzeb
parent 3e48d899ea
commit 6c2160ff4e
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
keymapper/data.py
View File

@ -31,7 +31,12 @@ from keymapper.logger import logger
def get_data_path(filename=''): def get_data_path(filename=''):
"""Depending on the installation prefix, return the data dir.""" """Depending on the installation prefix, return the data dir.
Since it is a nightmare to get stuff installed with pip across
distros this is somewhat complicated. Ubuntu wants to use /usr/local
for data_files, but not everything can be placed there.
"""
try: try:
source_path = pkg_resources.require('key-mapper')[0].location source_path = pkg_resources.require('key-mapper')[0].location
except pkg_resources.DistributionNotFound as error: except pkg_resources.DistributionNotFound as error:
@ -46,14 +51,23 @@ def get_data_path(filename=''):
# depending on where this file is installed to, make sure to use the proper # depending on where this file is installed to, make sure to use the proper
# prefix path for data # prefix path for data
# https://docs.python.org/3/distutils/setupscript.html?highlight=package_data#installing-additional-files # noqa pylint: disable=line-too-long # https://docs.python.org/3/distutils/setupscript.html?highlight=package_data#installing-additional-files # noqa pylint: disable=line-too-long
if source_path.startswith(site.USER_BASE):
data_path = os.path.join(site.USER_BASE, 'share/key-mapper') candidates = [
elif source_path.startswith('/usr/local/'): os.path.join(site.USER_BASE, 'share/key-mapper'),
data_path = '/usr/local/share/key-mapper' '/usr/local/share/key-mapper',
elif source_path.startswith('/usr/'): '/usr/share/key-mapper'
data_path = '/usr/share/key-mapper' ]
else:
# installed with -e, running from the cloned git source print('source_path', source_path)
if '/site-packages' not in source_path:
# probably installed with -e, running from the cloned git source
data_path = os.path.join(source_path, 'data') data_path = os.path.join(source_path, 'data')
else:
# try any of the options
for candidate in candidates:
if os.path.exists(candidate):
data_path = candidate
break
logger.error('Could not find the application data')
return os.path.join(data_path, filename) return os.path.join(data_path, filename)

1
setup.py
View File

@ -39,6 +39,7 @@ setup(
('/usr/share/key-mapper/', glob.glob('data/*')), ('/usr/share/key-mapper/', glob.glob('data/*')),
('/usr/share/applications/', ['data/key-mapper.desktop']), ('/usr/share/applications/', ['data/key-mapper.desktop']),
('/etc/xdg/autostart/', ['data/key-mapper-service.desktop']), ('/etc/xdg/autostart/', ['data/key-mapper-service.desktop']),
# manjaro installs the executables with pip, ubuntu doesn't.
('/usr/bin/', ['bin/key-mapper-gtk']), ('/usr/bin/', ['bin/key-mapper-gtk']),
('/usr/bin/', ['bin/key-mapper-service']), ('/usr/bin/', ['bin/key-mapper-service']),
], ],