Commit 742a1b5d authored by Jérome Perrin's avatar Jérome Perrin Committed by Rafael Monnerat

slaprunner: adjust $PATH in ~/.bash_profile to expose ~/bin/slapos

This simplifies 17931bed by not
overriding ~/.bashrc (that according to our ~/.bash_profile can be
modified by end users)
parent 39921264
......@@ -19,7 +19,7 @@ md5sum = 713db528880282d568278f09458d2aab
[template-runner]
filename = instance-runner.cfg
md5sum = 8f032f52e12d451e1c8364fe5057f428
md5sum = 9d79ae83d32ab145d9dca723b7285555
[template-runner-import-script]
filename = template/runner-import.sh.jinja2
......@@ -65,10 +65,6 @@ md5sum = f8446fcf254b4929eb828a9a1d7e5f62
filename = template/bash_profile.in
md5sum = 1c88cbca0c1e705eeb4b544ef4616097
[template-bashrc]
filename = template/bashrc.in
md5sum = d0b9060ec96d4d5b188e36c84240ea7d
[template-supervisord]
filename = template/supervisord.conf.in
md5sum = d294d0dafd265048399de6da8c96345f
......
......@@ -138,10 +138,6 @@ filename = resilient_software_release_information.py.in
< = template-download-base
filename = slapos-slapuser-script.in
[template-bashrc]
< = template-download-base
filename = bashrc.in
[eggs]
recipe = zc.recipe.egg
eggs =
......
......@@ -647,7 +647,7 @@ recipe = slapos.cookbook:shell
wrapper = $${directory:bin}/bash
shell = ${bash:location}/bin/bash
home = $${buildout:directory}
path = ${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin:${curl:location}/bin:${python2.7:location}/bin:${tig:location}/bin:${zip:location}/bin:${mosh:location}/bin:/usr/bin:/bin/
path = ${nano:location}/bin:${vim:location}/bin:${screen:location}/bin:${git:location}/bin:${curl:location}/bin:${python2.7:location}/bin:${tig:location}/bin:${zip:location}/bin:${mosh:location}/bin:$${buildout:directory}/bin/:/usr/bin:/bin/
ps1 = "\\w> "
[prepare-software]
......@@ -712,13 +712,6 @@ context =
raw path $PATH:$${shell:path}
key workdir runnerdirectory:home
[bashrc]
recipe = slapos.recipe.template:jinja2
template = ${template-bashrc:location}/${template-bashrc:filename}
rendered = $${buildout:directory}/.bashrc
context =
raw bin_folder ${buildout:bin-directory}
#---------------------------
#--
#-- supervisord managing slaprunner automation features
......
export PATH={{ bin_folder }}:$PATH
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