Commit 95d03393 authored by EXT tlavocat's avatar EXT tlavocat
Browse files

Get rid of the PATH problem

Since the two executables are really contentless, we can directly
invoque the python interpreter for the bridge and erebor. This still
assume that this is installed on each computer of the infrastructure.
parent 3cc6b1c3
......@@ -25,7 +25,7 @@ setup(
entry_points={
'console_scripts': [
'erebor=yggdrasil.erebor.main:main',
'socket-bridge=yggdrasil.isengard.socket_bridge:main',
'taktuk-bridge=yggdrasil.isengard.socket_bridge:main',
],
}
)
......@@ -1385,11 +1385,7 @@ class Erebor:
command = ""
epath = ""
tpath = ""
if not self.erebor_path == "" :
epath = " --erebor-path={} ".format(self.erebor_path)
command = "{}erebor/erebor_launch.sh {}".format(self.erebor_path, self.erebor_path)
else :
command = "main.py"
command = "python3 -c \"__requires__ = 'yggdrasil';import sys;from pkg_resources import load_entry_point;sys.exit(load_entry_point('yggdrasil', 'console_scripts', 'erebor')());\""
if not self.taktuk_path == "" :
tpath = " --taktuk-path={} ".format(self.taktuk_path)
network.execute_on(dest,
......
......@@ -69,7 +69,7 @@ class Unix_socket(Thread):
debug = ""
if len(self.debug_list) > 0 :
debug = "--debug="+(",".join(self.debug_list))
cmd ='0 exec [ socket_bridge.py --socket '+self.control_adress+" "+debug+" ] "
cmd ='0 exec [ python3 -c \"__requires__ = \'yggdrasil\';import sys;from pkg_resources import load_entry_point;sys.exit(load_entry_point(\'yggdrasil\', \'console_scripts\', \'taktuk-bridge\')());\" --socket '+self.control_adress+" "+debug+" ] "
self.taktuk.send_command(cmd)
def run(self):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment