software/theia: Fix shell bug

See merge request !951

software/theia/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = ab61eeb45300a91c0c4fb42bd5c52c9f
+md5sum = a82e4fdc4efd60df699ee072399e6973
 
 [yarn.lock]
 filename = yarn.lock

software/theia/generate_download_plugins_cfg.py

@@ -78,7 +78,8 @@ for plugin_and_version in '''\
     EditorConfig/EditorConfig/latest
     dbaeumer/vscode-eslint/latest
     ms-vscode/references-view/latest
-    golang/Go/0.16.2
+# golang.Go removed because it overwrites the PATH in theia shell
+# golang/Go/0.16.2
     vscjava/vscode-java-debug/0.29.0
     redhat/java/0.61.0
     vscjava/vscode-java-test/0.26.0

software/theia/instance.cfg.in

@@ -324,7 +324,7 @@ template =
   export EDITOR="${python-language-server:location}/bin/python -m theia_open --wait"
   export THEIA_DEFAULT_PLUGINS="local-dir:${theia-plugins:location}"
   . $${common-environment:rendered}
-  exec ${theia-wrapper:rendered} $@
+  exec ${theia-wrapper:rendered} "$@"
 ip =  $${theia-service-port:ip}
 port = $${theia-service-port:port}
 base-url = http://$${:ip}:$${:port}/
@@ -346,16 +346,22 @@ recipe = slapos.recipe.template:jinja2
 rendered = $${directory:bin}/$${:_buildout_section_name_}
 mode = 0700
 template = inline:
-  #!${python:location}/bin/python
-  import os
-  import sys
-  import time
-  args = sys.argv[1:]
+  #!{{ bash }}
+  SHELL=$BASH
   # when running interactively, activate slapos configuration and reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
-  if not args: args = ["-c", ". $${slapos-standalone-activate:rendered} && exec env GIT_EXEC_PATH= ${bash:location}/bin/bash --rcfile $${theia-bashrc:rendered}", ]
+  if [ $# = 0 ]; then
+    . {{ activate }}
+    unset GIT_EXEC_PATH
+    set -- --rcfile {{ bashrc }}
   # otherwise, assume this shell is running task and add an artificial delay to workaround https://github.com/eclipse-theia/theia/issues/2961
-  else: time.sleep(1)
-  os.execv('${bash:location}/bin/bash', ['${bash:location}/bin/bash']  + args)
+  else
+    sleep 1
+  fi
+  exec "$SHELL" "$@"
+context =
+  raw bash ${bash:location}/bin/bash
+  key activate slapos-standalone-activate:rendered
+  key bashrc theia-bashrc:rendered
 
 [theia-bashrc]
 recipe = slapos.recipe.template:jinja2
@@ -396,9 +402,8 @@ computer-id = slaprunner
 [slapos-standalone-activate]
 recipe = slapos.recipe.template:jinja2
 rendered = $${directory:bin}/$${:_buildout_section_name_}
-mode = 0700
 template =
-  inline:#!/bin/sh
+  inline:
   export PATH=${buildout:bin-directory}:$PATH
   export SLAPOS_CONFIGURATION=$${slapos-standalone-config:slapos-configuration}
   export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION
@@ -411,6 +416,7 @@ mode = 0700
 template =
   inline:#!/bin/sh
   . $${common-environment:rendered}
+  #XXX find out where the extra nodejs in theia's PATH comes from
   export PATH=${nodejs:location}/bin/:$PATH
   . $${slapos-standalone-activate:rendered}
   exec ${slapos-standalone:script-path} \

software/theia/software.cfg

@@ -310,7 +310,7 @@ template =
   inline:
   #!/bin/sh
   cd ${theia:location}
-  exec ${yarn:location}/bin/yarn theia start $@
+  exec ${yarn:location}/bin/yarn theia start "$@"
 
 
 [instance]