From 79578310a962755dacfe623ff80ec56bba02c024 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 15:55:02 +0200 Subject: [PATCH 01/19] Update fenrir-daemon --- src/fenrir/fenrir-daemon | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/fenrir/fenrir-daemon b/src/fenrir/fenrir-daemon index 8d5531fb..d9147fb5 100755 --- a/src/fenrir/fenrir-daemon +++ b/src/fenrir/fenrir-daemon @@ -4,11 +4,11 @@ # Fenrir TTY screen reader # By Chrys, Storm Dragon, and contributers. -import os, sys -import fenrirVersion +import os, sys, inspect +fenrirPath = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) -if not os.path.dirname(os.path.realpath(fenrirVersion.__file__)) in sys.path: - sys.path.append(os.path.dirname(os.path.realpath(fenrirVersion.__file__))) +if not fenrirPath in sys.path: +sys.path.append(fenrirPath) from core import fenrirManager from daemonize import Daemonize From 254acf6c329c23d1c50b4c71f4bc5108acdfc5f4 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 15:58:02 +0200 Subject: [PATCH 02/19] Update setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index afca2691..6b6d8f90 100755 --- a/setup.py +++ b/setup.py @@ -45,6 +45,7 @@ setup( "sox", "dbus-python", "pyenchant", + "pyudev", "setuptools", ], From e82945282bd34c56d614c8e2ecb33a49b0cabb10 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 16:05:29 +0200 Subject: [PATCH 03/19] Update commandManager.py --- src/fenrir/core/commandManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/core/commandManager.py b/src/fenrir/core/commandManager.py index 9663301d..9a6060ea 100644 --- a/src/fenrir/core/commandManager.py +++ b/src/fenrir/core/commandManager.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import glob, os, time, inspect -currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) +currentdir = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe())))) fenrirPath = os.path.dirname(currentdir) from core import debug From 6ce49e4a37d9288cd7543d0ad1f48f84378702ed Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 16:05:51 +0200 Subject: [PATCH 04/19] Update settingsManager.py --- src/fenrir/core/settingsManager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/core/settingsManager.py b/src/fenrir/core/settingsManager.py index b09329f9..8b6846aa 100644 --- a/src/fenrir/core/settingsManager.py +++ b/src/fenrir/core/settingsManager.py @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import os, inspect -currentdir = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) +currentdir = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe())))) fenrirPath = os.path.dirname(currentdir) from configparser import ConfigParser From c7ec6a971af826ad1a2bd0f1f39019c5bf3d75d9 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 16:06:25 +0200 Subject: [PATCH 05/19] Update fenrir --- src/fenrir/fenrir | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/fenrir b/src/fenrir/fenrir index 24aa6264..d8107dfe 100755 --- a/src/fenrir/fenrir +++ b/src/fenrir/fenrir @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import os, sys, inspect -fenrirPath = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) +fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe())))) if not fenrirPath in sys.path: sys.path.append(fenrirPath) From cef29ac9eeb832974bde117451074078a0808ab2 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 16:06:46 +0200 Subject: [PATCH 06/19] Update fenrir-daemon --- src/fenrir/fenrir-daemon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/fenrir-daemon b/src/fenrir/fenrir-daemon index d9147fb5..2afc6c02 100755 --- a/src/fenrir/fenrir-daemon +++ b/src/fenrir/fenrir-daemon @@ -5,7 +5,7 @@ # By Chrys, Storm Dragon, and contributers. import os, sys, inspect -fenrirPath = os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))) +fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe())))) if not fenrirPath in sys.path: sys.path.append(fenrirPath) From 8a5ec627dc853f73161f102b861732d56f5ad1a6 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 16:07:46 +0200 Subject: [PATCH 07/19] Update fenrir-daemon --- src/fenrir/fenrir-daemon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/fenrir-daemon b/src/fenrir/fenrir-daemon index 2afc6c02..a8dd678d 100755 --- a/src/fenrir/fenrir-daemon +++ b/src/fenrir/fenrir-daemon @@ -8,7 +8,7 @@ import os, sys, inspect fenrirPath = os.path.dirname(os.path.realpath(os.path.abspath(inspect.getfile(inspect.currentframe())))) if not fenrirPath in sys.path: -sys.path.append(fenrirPath) + sys.path.append(fenrirPath) from core import fenrirManager from daemonize import Daemonize From 8bb3ed253f2358c66dd65c987c3791b992b75c59 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 16:13:25 +0200 Subject: [PATCH 08/19] Update fenrir-daemon --- src/fenrir/fenrir-daemon | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/fenrir/fenrir-daemon b/src/fenrir/fenrir-daemon index a8dd678d..eefc5054 100755 --- a/src/fenrir/fenrir-daemon +++ b/src/fenrir/fenrir-daemon @@ -23,6 +23,6 @@ def main(): if __name__ == "__main__": # for debug in foreground #daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, foreground=True,chdir=os.path.dirname(os.path.realpath(fenrirVersion.__file__))) - daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, chdir=os.path.dirname(os.path.realpath(fenrirVersion.__file__))) + daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, chdir=fenrirPath) daemon.start() From 4cea906b78642906fd06555f4f28cdbbca50af8d Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 16:59:19 +0200 Subject: [PATCH 09/19] Update setup.py --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup.py b/setup.py index 6b6d8f90..fb017836 100755 --- a/setup.py +++ b/setup.py @@ -38,6 +38,10 @@ setup( # Include additional files into the package include_package_data=True, zip_safe=False, + + data_files=[('/etc/fenrir', ['config/*]), + + ], # Dependent packages (distributions) install_requires=[ From c9d215afedc2a1c6791fe8b1b8d5540b0e791e1e Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 17:01:05 +0200 Subject: [PATCH 10/19] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index fb017836..1ad67ea4 100755 --- a/setup.py +++ b/setup.py @@ -39,7 +39,7 @@ setup( include_package_data=True, zip_safe=False, - data_files=[('/etc/fenrir', ['config/*]), + data_files=[('/etc/fenrir', ['config/*']), ], From 5970785836062a2a3016b309c53dc00da7232930 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 17:19:40 +0200 Subject: [PATCH 11/19] Update setup.py --- setup.py | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 1ad67ea4..c2629324 100755 --- a/setup.py +++ b/setup.py @@ -1,9 +1,27 @@ #!/bin/python #https://python-packaging.readthedocs.io/en/latest/minimal.html -import os +import os, glob from setuptools import find_packages from setuptools import setup fenrirVersion = '1.5' + +data_files = [] +directories = glob.glob('config/*') +for directory in directories: + files = glob.glob(directory+'/*') + destDir = '/etc/fenrir' + if directory == 'config/punctuation': + destDir = '/etc/fenrir/punctuation' + elif directory == 'config/keyboard': + destDir = '/etc/fenrir/keyboard' + if directory == 'config/settings': + destDir = '/etc/fenrir/settings' + elif directory == 'config/scripts': + destDir = '/usr/share/fenrir/scripts/' + elif directory == 'config/sound': + destDir = '/usr/share/sounds/fenrir' + data_files.append((destDir, files)) + def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() @@ -39,7 +57,7 @@ setup( include_package_data=True, zip_safe=False, - data_files=[('/etc/fenrir', ['config/*']), + data_files=data_files, ], From d92a504321579d6dbe162ab586b4303a80521d03 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 17:20:26 +0200 Subject: [PATCH 12/19] Update setup.py --- setup.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/setup.py b/setup.py index c2629324..35018c6b 100755 --- a/setup.py +++ b/setup.py @@ -58,8 +58,6 @@ setup( zip_safe=False, data_files=data_files, - - ], # Dependent packages (distributions) install_requires=[ From 0bf9ba33d46f07256ec0026ff741f4b19aeb2cc6 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 17:22:27 +0200 Subject: [PATCH 13/19] Update setup.py --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 35018c6b..43cba452 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from setuptools import setup fenrirVersion = '1.5' data_files = [] -directories = glob.glob('config/*') +directories = glob.glob('config/*/*') for directory in directories: files = glob.glob(directory+'/*') destDir = '/etc/fenrir' @@ -17,7 +17,7 @@ for directory in directories: if directory == 'config/settings': destDir = '/etc/fenrir/settings' elif directory == 'config/scripts': - destDir = '/usr/share/fenrir/scripts/' + destDir = '/usr/share/fenrir/scripts' elif directory == 'config/sound': destDir = '/usr/share/sounds/fenrir' data_files.append((destDir, files)) From 9e91160df47097e3b84545166c1742e21fbd3bee Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 17:23:52 +0200 Subject: [PATCH 14/19] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 43cba452..3a910285 100755 --- a/setup.py +++ b/setup.py @@ -18,7 +18,7 @@ for directory in directories: destDir = '/etc/fenrir/settings' elif directory == 'config/scripts': destDir = '/usr/share/fenrir/scripts' - elif directory == 'config/sound': + elif 'config/sound' in directory: destDir = '/usr/share/sounds/fenrir' data_files.append((destDir, files)) From e0efff8ed1ef8b815fb8ac0792dc2311a079b580 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 17:38:25 +0200 Subject: [PATCH 15/19] Update setup.py --- setup.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 3a910285..65b0b5cd 100755 --- a/setup.py +++ b/setup.py @@ -19,7 +19,12 @@ for directory in directories: elif directory == 'config/scripts': destDir = '/usr/share/fenrir/scripts' elif 'config/sound' in directory: - destDir = '/usr/share/sounds/fenrir' + if "default-wav" in directory: + destDir = '/usr/share/sounds/fenrir/default-wav' + elif "default" in directory: + destDir = '/usr/share/sounds/fenrir/default' + elif "template" in directory: + destDir = '/usr/share/sounds/fenrir/template' data_files.append((destDir, files)) def read(fname): From 1a13c69c032115b00280cf9c8ef61a1a11132eb9 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 17:42:03 +0200 Subject: [PATCH 16/19] Update setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 65b0b5cd..ca7eedf8 100755 --- a/setup.py +++ b/setup.py @@ -14,7 +14,7 @@ for directory in directories: destDir = '/etc/fenrir/punctuation' elif directory == 'config/keyboard': destDir = '/etc/fenrir/keyboard' - if directory == 'config/settings': + elif directory == 'config/settings': destDir = '/etc/fenrir/settings' elif directory == 'config/scripts': destDir = '/usr/share/fenrir/scripts' From 485a67e9d3f21bfef491781111849e7a65e70e6b Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 17:46:38 +0200 Subject: [PATCH 17/19] Update setup.py --- setup.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index ca7eedf8..bbe2346f 100755 --- a/setup.py +++ b/setup.py @@ -9,14 +9,15 @@ data_files = [] directories = glob.glob('config/*/*') for directory in directories: files = glob.glob(directory+'/*') + print(directory) destDir = '/etc/fenrir' - if directory == 'config/punctuation': + if 'config/punctuation' in directory : destDir = '/etc/fenrir/punctuation' - elif directory == 'config/keyboard': + elif 'config/keyboard' in directory: destDir = '/etc/fenrir/keyboard' - elif directory == 'config/settings': + elif 'config/settings' in directory: destDir = '/etc/fenrir/settings' - elif directory == 'config/scripts': + elif 'config/scripts' in directory: destDir = '/usr/share/fenrir/scripts' elif 'config/sound' in directory: if "default-wav" in directory: From fef3aa3a5824360114800dea88f2a78791631ee8 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 17:50:59 +0200 Subject: [PATCH 18/19] Update setup.py --- setup.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/setup.py b/setup.py index bbe2346f..d175c663 100755 --- a/setup.py +++ b/setup.py @@ -6,11 +6,10 @@ from setuptools import setup fenrirVersion = '1.5' data_files = [] -directories = glob.glob('config/*/*') +directories = glob.glob('config/*') for directory in directories: - files = glob.glob(directory+'/*') - print(directory) - destDir = '/etc/fenrir' + files = glob.glob(directory+'/*') + destDir = '' if 'config/punctuation' in directory : destDir = '/etc/fenrir/punctuation' elif 'config/keyboard' in directory: @@ -26,7 +25,8 @@ for directory in directories: destDir = '/usr/share/sounds/fenrir/default' elif "template" in directory: destDir = '/usr/share/sounds/fenrir/template' - data_files.append((destDir, files)) + if destDir != '': + data_files.append((destDir, files)) def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() From e011b42ea447dd589cf8fcb27b65ab3b6ab56c43 Mon Sep 17 00:00:00 2001 From: chrys87 Date: Tue, 25 Jul 2017 17:54:50 +0200 Subject: [PATCH 19/19] Update setup.py --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index d175c663..53e9ba0f 100755 --- a/setup.py +++ b/setup.py @@ -27,6 +27,7 @@ for directory in directories: destDir = '/usr/share/sounds/fenrir/template' if destDir != '': data_files.append((destDir, files)) + data_files.append(('/usr/lib/systemd/system/', 'autostart/systemd/fenrir.service')) def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read()