From d74eb583133bb6b0208545b153541d12bd323e2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Thu, 4 Apr 2019 07:28:02 +0200 Subject: [PATCH] slaprunner: set $TERMINFO in bash profile so that terminal uses terminfo from the same curses library. --- software/slaprunner/buildout.hash.cfg | 4 ++-- software/slaprunner/instance-runner.cfg | 4 ++++ software/slaprunner/template/bash_profile.in | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/software/slaprunner/buildout.hash.cfg b/software/slaprunner/buildout.hash.cfg index 769546c9c..e94ae2bcb 100644 --- a/software/slaprunner/buildout.hash.cfg +++ b/software/slaprunner/buildout.hash.cfg @@ -18,7 +18,7 @@ md5sum = c44a7481bb85e3258128afe3fcf23f44 [template-runner] filename = instance-runner.cfg -md5sum = 4923167fe68c8c20aff46dbeb3716f9b +md5sum = 7529924d81c0d06c73b2f87b00bb8d05 [template-runner-import-script] filename = template/runner-import.sh.jinja2 @@ -58,7 +58,7 @@ md5sum = f8446fcf254b4929eb828a9a1d7e5f62 [template-bash-profile] filename = template/bash_profile.in -md5sum = 37eea89042a58127c85e6b3886260e59 +md5sum = 703bb29604843774797dd246e67a4a52 [template-supervisord] filename = template/supervisord.conf.in diff --git a/software/slaprunner/instance-runner.cfg b/software/slaprunner/instance-runner.cfg index e92939415..aadf926ef 100644 --- a/software/slaprunner/instance-runner.cfg +++ b/software/slaprunner/instance-runner.cfg @@ -777,9 +777,13 @@ rendered = $${buildout:directory}/.bash_profile context = raw path $${shell-environment:path} raw shell $${shell-environment:shell} + key terminfo terminfo:location key instance_name slap-parameter:instance-name key workdir runnerdirectory:home +[terminfo] +location = ${ncurses:location}/share/terminfo/ + #--------------------------- #-- #-- supervisord managing slaprunner automation features diff --git a/software/slaprunner/template/bash_profile.in b/software/slaprunner/template/bash_profile.in index cf2322dc4..637578a57 100644 --- a/software/slaprunner/template/bash_profile.in +++ b/software/slaprunner/template/bash_profile.in @@ -10,6 +10,8 @@ export PROMPT_COMMAND='echo -en "\033]0;{{-instance_name}}\a"' {% endif %} export PS1="$ " +export TERMINFO={{- terminfo }} + if [ -f "$HOME/.bashrc" ] ; then source $HOME/.bashrc fi @@ -32,5 +34,5 @@ alias la='ls -A' alias l='ls -CF' echo "Welcome to SlapOS slaprunner shell" -echo +echo -- 2.30.9