Browse Source

Export variables directly

The Paths weren't set when the export was done indirectly.

Contributes to CURA-9365
fix_tk_recipe_env_info
j.spijker@ultimaker.com 4 years ago committed by Jelle Spijker
parent
commit
f6c7a77072
  1. 15
      generators/VirtualPythonEnvResources/activate.jinja

15
generators/VirtualPythonEnvResources/activate.jinja

@ -4,8 +4,7 @@
deactivate () {
# reset old environment variables
{% for var in envvars.keys() %}if [ -n "$_OLD_{{ var }}" ] ; then
{{ var }}="$_OLD_{{ var }}"
export {{ var }}
export {{ var }}="$_OLD_{{ var }}"
unset _OLD_{{ var }}
else
unset {{ var }}
@ -13,20 +12,16 @@ deactivate () {
{% endfor %}
if [ -n "${_OLD_VIRTUAL_PS1}" ] ; then
PS1="${_OLD_VIRTUAL_PS1}"
export PS1
export PS1="${_OLD_VIRTUAL_PS1}"
unset _OLD_VIRTUAL_PS1
fi
}
{% for var, value in envvars.items() %}if [ -n "${{ var }}" ] ; then
_OLD_{{ var }}="${{ var }}"
export _OLD_{{ var }}
export _OLD_{{ var }}="${{ var }}"
fi
{{ var }}="{{ value }}"
export {{ var }}
export {{ var }}="{{ value }}"
{% endfor %}
_OLD_VIRTUAL_PS1="${PS1:-}"
PS1="({{ prompt }}) ${PS1:-}"
export PS1
export PS1="({{ prompt }}) ${PS1:-}"

Loading…
Cancel
Save