diff --git a/experimental/setup.py b/experimental/setup.py deleted file mode 100755 index 5a47f695..00000000 --- a/experimental/setup.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/python -import os -from setuptools import find_packages -from setuptools import setup -def read(fname): - return open(os.path.join(os.path.dirname(__file__), fname)).read() - - - -setup( - # Application name: - name="fenrir", - # Version number (initial): - version="0.1a", - - # Application author details: - author="Chrys and others", - author_email="chrys87@web.de", - - # Packages - packages=find_packages('src/fenrir'), - package_dir={'': 'src/fenrir'}, - scripts=['src/fenrir/fenrir','src/fenrir/fenrir-daemon'], - #entry_points = { - # "console_scripts": ['fenrir = fenrir:main'] - # }, - - # Include additional files into the package - include_package_data=True, - - # Details - url="https://github.com/chrys87/fenrir/", - zip_safe=False, - # - # license="MIT", - description="An TTY Screen Reader For Linux.", - long_description=read('README.md'), - classifiers=[ - "Development Status :: 3 - Alpha", -], - # Dependent packages (distributions) - install_requires=[ - "evdev", - "sox", - ], - -) - diff --git a/src/fenrir/core/commandManager.py b/src/fenrir/core/commandManager.py index 631eabdf..cb198f33 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 -import __main__ +import fenrirVersion from core import debug from utils import module_utils @@ -29,7 +29,7 @@ class commandManager(): def loadCommands(self, section='commands',commandPath=''): if commandPath =='': - commandPath = os.path.dirname(os.path.realpath(__main__.__file__))+ "/commands/" + commandPath = os.path.dirname(os.path.realpath(fenrirVersion.__file__))+ "/commands/" if not commandPath.endswith('/'): commandPath += '/' commandFolder = commandPath + section +"/" @@ -73,8 +73,8 @@ class commandManager(): if not scriptPath.endswith('/'): scriptPath += '/' if not os.path.exists(scriptPath): - if os.path.exists(os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/scripts/'): - scriptPath = os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/scripts/' + if os.path.exists(os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/scripts/'): + scriptPath = os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/scripts/' else: self.env['runtime']['debug'].writeDebugOut("scriptpath not exists:" + scriptPath ,debug.debugLevel.WARNING) return @@ -85,7 +85,7 @@ class commandManager(): self.env['runtime']['debug'].writeDebugOut("scriptpath not readable:" + scriptPath ,debug.debugLevel.ERROR) return commandList = glob.glob(scriptPath+'*') - subCommand = os.path.dirname(os.path.realpath(__main__.__file__)) + '/commands/commands/subprocess.py' + subCommand = os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + '/commands/commands/subprocess.py' for command in commandList: invalid = False try: diff --git a/src/fenrir/core/fenrirManager.py b/src/fenrir/core/fenrirManager.py index d70aa1ae..cb8ffda8 100644 --- a/src/fenrir/core/fenrirManager.py +++ b/src/fenrir/core/fenrirManager.py @@ -5,10 +5,10 @@ # By Chrys, Storm Dragon, and contributers. import os, sys, signal, time -import __main__ +import fenrirVersion -if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path: - sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__))) +if not os.path.dirname(os.path.realpath(fenrirVersion.__file__)) in sys.path: + sys.path.append(os.path.dirname(os.path.realpath(fenrirVersion.__file__))) from core import i18n from core import settingsManager diff --git a/src/fenrir/core/settingsManager.py b/src/fenrir/core/settingsManager.py index 7ade5141..5d11e80b 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 -import __main__ +import fenrirVersion from configparser import ConfigParser from core import eventManager from core import inputManager @@ -29,7 +29,7 @@ class settingsManager(): self.env = environment def shutdown(self): pass - def loadShortcuts(self, kbConfigPath=os.path.dirname(os.path.realpath(__main__.__file__)) + '/../../config/keyboard/desktop.conf'): + def loadShortcuts(self, kbConfigPath=os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + '/../../config/keyboard/desktop.conf'): kbConfig = open(kbConfigPath,"r") while(True): invalid = False @@ -103,7 +103,7 @@ class settingsManager(): def isValidKey(self, key): return key in inputData.keyNames - def loadDicts(self, dictConfigPath=os.path.dirname(os.path.realpath(__main__.__file__)) + '/../../config/punctuation/default.conf'): + def loadDicts(self, dictConfigPath=os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + '/../../config/punctuation/default.conf'): dictConfig = open(dictConfigPath,"r") currDictName = '' while(True): @@ -201,7 +201,7 @@ class settingsManager(): if self.env['runtime'][driverType] != None: self.env['runtime'][driverType].shutdown(self.env) driver_mod = module_utils.importModule(driverName, - os.path.dirname(os.path.realpath(__main__.__file__)) + "/" + driverType + '/' + driverName + '.py') + os.path.dirname(os.path.realpath(fenrirVersion.__file__)) + "/" + driverType + '/' + driverName + '.py') self.env['runtime'][driverType] = driver_mod.driver() self.env['runtime'][driverType].initialize(self.env) self.env['runtime']['debug'].writeDebugOut('Loading Driver ' + driverType + ' (' + driverName +") OK",debug.debugLevel.INFO, onAnyLevel=True) @@ -250,8 +250,8 @@ class settingsManager(): environment['runtime']['debug'].initialize(environment) # get fenrir settings root if not os.path.exists(settingsRoot): - if os.path.exists(os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/'): - settingsRoot = os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/' + if os.path.exists(os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/'): + settingsRoot = os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/' else: return None # get settings file @@ -262,8 +262,8 @@ class settingsManager(): return None # get sound themes root if not os.path.exists(soundRoot): - if os.path.exists(os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/sound/'): - soundRoot = os.path.dirname(os.path.realpath(__main__.__file__)) +'/../../config/sound/' + if os.path.exists(os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/sound/'): + soundRoot = os.path.dirname(os.path.realpath(fenrirVersion.__file__)) +'/../../config/sound/' environment['runtime']['settingsManager'] = self environment['runtime']['settingsManager'].initialize(environment) diff --git a/src/fenrir/fenrir b/src/fenrir/fenrir index b29508c9..01bbb45f 100755 --- a/src/fenrir/fenrir +++ b/src/fenrir/fenrir @@ -5,10 +5,10 @@ # By Chrys, Storm Dragon, and contributers. import os, sys -import __main__ +import fenrirVersion -if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path: - sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__))) +if not os.path.dirname(os.path.realpath(fenrirVersion.__file__)) in sys.path: + sys.path.append(os.path.dirname(os.path.realpath(fenrirVersion.__file__))) from core import fenrirManager diff --git a/src/fenrir/fenrir-daemon b/src/fenrir/fenrir-daemon index f4664a9a..8d5531fb 100755 --- a/src/fenrir/fenrir-daemon +++ b/src/fenrir/fenrir-daemon @@ -5,10 +5,10 @@ # By Chrys, Storm Dragon, and contributers. import os, sys -import __main__ +import fenrirVersion -if not os.path.dirname(os.path.realpath(__main__.__file__)) in sys.path: - sys.path.append(os.path.dirname(os.path.realpath(__main__.__file__))) +if not os.path.dirname(os.path.realpath(fenrirVersion.__file__)) in sys.path: + sys.path.append(os.path.dirname(os.path.realpath(fenrirVersion.__file__))) from core import fenrirManager from daemonize import Daemonize @@ -22,7 +22,7 @@ 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(__main__.__file__))) - daemon = Daemonize(app="fenrir-daemon", pid=pidFile, action=main, chdir=os.path.dirname(os.path.realpath(__main__.__file__))) + #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.start()