From 0ada33c695b8ad5add42d6f39cdfd90ee99b6cf1 Mon Sep 17 00:00:00 2001 From: OpenGnSys Support Team Date: Fri, 26 Jun 2020 11:04:32 +0200 Subject: rename main.py to ogclient --- main.py | 36 ------------------------------------ ogclient | 36 ++++++++++++++++++++++++++++++++++++ setup.py | 2 +- tests/units/client.py | 2 +- 4 files changed, 38 insertions(+), 38 deletions(-) delete mode 100755 main.py create mode 100755 ogclient diff --git a/main.py b/main.py deleted file mode 100755 index d056703..0000000 --- a/main.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/python3 - -# -# Copyright (C) 2020 Soleta Networks -# -# This program is free software: you can redistribute it and/or modify it under -# the terms of the GNU Affero General Public License as published by the -# Free Software Foundation, version 3. -# - -import json -import subprocess -from src.ogClient import * -from signal import signal, SIGPIPE, SIG_DFL - -def main(): - signal(SIGPIPE, SIG_DFL) - config_path = f'{ogClient.OG_PATH}ogclient/cfg/ogclient.json' - try: - with open(config_path, 'r') as f: - CONFIG = json.load(f) - except: - print('Error: Parsing configuration file') - return 0 - - MODE = CONFIG['opengnsys']['mode'] - URL = CONFIG['opengnsys']['url'] - if MODE == 'live': - proc = subprocess.Popen(["browser", "-qws", URL]) - - client = ogClient(config=CONFIG) - client.connect() - client.run() - -if __name__ == "__main__": - main() diff --git a/ogclient b/ogclient new file mode 100755 index 0000000..d056703 --- /dev/null +++ b/ogclient @@ -0,0 +1,36 @@ +#!/usr/bin/python3 + +# +# Copyright (C) 2020 Soleta Networks +# +# This program is free software: you can redistribute it and/or modify it under +# the terms of the GNU Affero General Public License as published by the +# Free Software Foundation, version 3. +# + +import json +import subprocess +from src.ogClient import * +from signal import signal, SIGPIPE, SIG_DFL + +def main(): + signal(SIGPIPE, SIG_DFL) + config_path = f'{ogClient.OG_PATH}ogclient/cfg/ogclient.json' + try: + with open(config_path, 'r') as f: + CONFIG = json.load(f) + except: + print('Error: Parsing configuration file') + return 0 + + MODE = CONFIG['opengnsys']['mode'] + URL = CONFIG['opengnsys']['url'] + if MODE == 'live': + proc = subprocess.Popen(["browser", "-qws", URL]) + + client = ogClient(config=CONFIG) + client.connect() + client.run() + +if __name__ == "__main__": + main() diff --git a/setup.py b/setup.py index 5d5330d..eeaf5ff 100644 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup(name='ogclient', author_email='soporte-og@soleta.eu', url='https://github.com/opengnsys/ogClient', packages=['src', 'src.linux', 'src.virtual'], - scripts=['main.py'], + scripts=['ogclient'], data_files=[('cfg', ['cfg/ogclient.json']), ('', ['LICENSE'])] ) diff --git a/tests/units/client.py b/tests/units/client.py index 21cf21f..0b678dc 100644 --- a/tests/units/client.py +++ b/tests/units/client.py @@ -13,7 +13,7 @@ class Client(): def __init__(self): self.null = open(os.devnull, 'wb') - self.proc = subprocess.Popen(['python3', 'main.py'], + self.proc = subprocess.Popen(['python3', 'ogclient'], cwd='../', stdout=self.null, stderr=self.null) -- cgit v1.2.3-18-g5258