Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Ramos Carreño
slapos
Commits
53f9c261
Commit
53f9c261
authored
Mar 29, 2021
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
software/theia: Fix shell bug
See merge request
!951
parents
37237622
722179f0
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
81 additions
and
75 deletions
+81
-75
software/theia/buildout.hash.cfg
software/theia/buildout.hash.cfg
+1
-1
software/theia/download-plugins.cfg
software/theia/download-plugins.cfg
+60
-61
software/theia/generate_download_plugins_cfg.py
software/theia/generate_download_plugins_cfg.py
+2
-1
software/theia/instance.cfg.in
software/theia/instance.cfg.in
+17
-11
software/theia/software.cfg
software/theia/software.cfg
+1
-1
No files found.
software/theia/buildout.hash.cfg
View file @
53f9c261
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
[instance]
[instance]
filename = instance.cfg.in
filename = instance.cfg.in
md5sum = a
b61eeb45300a91c0c4fb42bd5c52c9f
md5sum = a
82e4fdc4efd60df699ee072399e6973
[yarn.lock]
[yarn.lock]
filename = yarn.lock
filename = yarn.lock
...
...
software/theia/download-plugins.cfg
View file @
53f9c261
This diff is collapsed.
Click to expand it.
software/theia/generate_download_plugins_cfg.py
View file @
53f9c261
...
@@ -78,7 +78,8 @@ for plugin_and_version in '''\
...
@@ -78,7 +78,8 @@ for plugin_and_version in '''\
EditorConfig/EditorConfig/latest
EditorConfig/EditorConfig/latest
dbaeumer/vscode-eslint/latest
dbaeumer/vscode-eslint/latest
ms-vscode/references-view/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
vscjava/vscode-java-debug/0.29.0
redhat/java/0.61.0
redhat/java/0.61.0
vscjava/vscode-java-test/0.26.0
vscjava/vscode-java-test/0.26.0
...
...
software/theia/instance.cfg.in
View file @
53f9c261
...
@@ -324,7 +324,7 @@ template =
...
@@ -324,7 +324,7 @@ template =
export EDITOR="${python-language-server:location}/bin/python -m theia_open --wait"
export EDITOR="${python-language-server:location}/bin/python -m theia_open --wait"
export THEIA_DEFAULT_PLUGINS="local-dir:${theia-plugins:location}"
export THEIA_DEFAULT_PLUGINS="local-dir:${theia-plugins:location}"
. $${common-environment:rendered}
. $${common-environment:rendered}
exec ${theia-wrapper:rendered}
$@
exec ${theia-wrapper:rendered}
"$@"
ip = $${theia-service-port:ip}
ip = $${theia-service-port:ip}
port = $${theia-service-port:port}
port = $${theia-service-port:port}
base-url = http://$${:ip}:$${:port}/
base-url = http://$${:ip}:$${:port}/
...
@@ -346,16 +346,22 @@ recipe = slapos.recipe.template:jinja2
...
@@ -346,16 +346,22 @@ recipe = slapos.recipe.template:jinja2
rendered = $${directory:bin}/$${:_buildout_section_name_}
rendered = $${directory:bin}/$${:_buildout_section_name_}
mode = 0700
mode = 0700
template = inline:
template = inline:
#!${python:location}/bin/python
#!{{ bash }}
import os
SHELL=$BASH
import sys
import time
args = sys.argv[1:]
# when running interactively, activate slapos configuration and reset GIT_EXEC_PATH to workaround https://github.com/eclipse-theia/theia/issues/7555
# 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
# 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)
else
os.execv('${bash:location}/bin/bash', ['${bash:location}/bin/bash'] + args)
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]
[theia-bashrc]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
...
@@ -396,9 +402,8 @@ computer-id = slaprunner
...
@@ -396,9 +402,8 @@ computer-id = slaprunner
[slapos-standalone-activate]
[slapos-standalone-activate]
recipe = slapos.recipe.template:jinja2
recipe = slapos.recipe.template:jinja2
rendered = $${directory:bin}/$${:_buildout_section_name_}
rendered = $${directory:bin}/$${:_buildout_section_name_}
mode = 0700
template =
template =
inline:
#!/bin/sh
inline:
export PATH=${buildout:bin-directory}:$PATH
export PATH=${buildout:bin-directory}:$PATH
export SLAPOS_CONFIGURATION=$${slapos-standalone-config:slapos-configuration}
export SLAPOS_CONFIGURATION=$${slapos-standalone-config:slapos-configuration}
export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION
export SLAPOS_CLIENT_CONFIGURATION=$SLAPOS_CONFIGURATION
...
@@ -411,6 +416,7 @@ mode = 0700
...
@@ -411,6 +416,7 @@ mode = 0700
template =
template =
inline:#!/bin/sh
inline:#!/bin/sh
. $${common-environment:rendered}
. $${common-environment:rendered}
#XXX find out where the extra nodejs in theia's PATH comes from
export PATH=${nodejs:location}/bin/:$PATH
export PATH=${nodejs:location}/bin/:$PATH
. $${slapos-standalone-activate:rendered}
. $${slapos-standalone-activate:rendered}
exec ${slapos-standalone:script-path} \
exec ${slapos-standalone:script-path} \
...
...
software/theia/software.cfg
View file @
53f9c261
...
@@ -310,7 +310,7 @@ template =
...
@@ -310,7 +310,7 @@ template =
inline:
inline:
#!/bin/sh
#!/bin/sh
cd ${theia:location}
cd ${theia:location}
exec ${yarn:location}/bin/yarn theia start
$@
exec ${yarn:location}/bin/yarn theia start
"$@"
[instance]
[instance]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment