Commit 02f0122b authored by Jérome Perrin's avatar Jérome Perrin

software/theia: generate a ~/bin/slapos wrapper

Webrunner was using this and it's natural for users coming from
slaprunner to find slapos wrapper in ~/bin/slapos, but where theia is
very incompatible is that ~/bin/sla[TAB] will another slapos-standalone
which will conflict with the one from theia.
parent 0ab8c833
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
[instance-theia] [instance-theia]
_update_hash_filename_ = instance-theia.cfg.jinja.in _update_hash_filename_ = instance-theia.cfg.jinja.in
md5sum = bf611d4551e6c2d4ea5fd22c3ae8ecfd md5sum = 43b3435b3bc08db42335c03b5b8fe465
[instance] [instance]
_update_hash_filename_ = instance.cfg.in _update_hash_filename_ = instance.cfg.in
......
...@@ -14,6 +14,7 @@ theia-environment-parts = ...@@ -14,6 +14,7 @@ theia-environment-parts =
theia-parts = theia-parts =
frontend-instance frontend-instance
slapos-standalone-bin-wrapper
promises promises
parts = parts =
...@@ -629,6 +630,11 @@ hash-files = ...@@ -629,6 +630,11 @@ hash-files =
hostname = $${slapos-standalone-config:ipv4} hostname = $${slapos-standalone-config:ipv4}
port = $${slapos-standalone-config:port} port = $${slapos-standalone-config:port}
[slapos-standalone-bin-wrapper]
recipe = slapos.cookbook:wrapper
wrapper-path = $${directory:bin}/slapos
command-line = $${slapos-standalone-config:base-directory}/bin/slapos
# Slapos Standalone Autoprocessing # Slapos Standalone Autoprocessing
# -------------------------------- # --------------------------------
......
...@@ -67,7 +67,7 @@ class TheiaTestCase(SlapOSInstanceTestCase): ...@@ -67,7 +67,7 @@ class TheiaTestCase(SlapOSInstanceTestCase):
try: try:
return cls._theia_slapos return cls._theia_slapos
except AttributeError: except AttributeError:
cls._theia_slapos = slapos = cls.getPath('srv', 'runner', 'bin', 'slapos') cls._theia_slapos = slapos = cls.getPath('bin', 'slapos')
return slapos return slapos
@classmethod @classmethod
......
Markdown is supported
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