Fix the activation script.

Do not export a VIRTUAL_ENV environment variable when activating the ODK
native environment, as this can cause confusion with Python-style
virtual environments.

Author: gouttegd

src/incatools/odk/activate.jinja2

@@ -40,8 +40,6 @@ deactivate() {
         export PS1
         unset _OLD_VIRTUAL_PS1
     fi
-    unset VIRTUAL_ENV
-    unset VIRTUAL_ENV_PROMPT
     unset ODK_RESOURCES_DIR
 
     hash -r 2>/dev/null
@@ -53,26 +51,21 @@ deactivate() {
 
 deactivate nondestructive
 
-VIRTUAL_ENV={{target_dir}}
-export VIRTUAL_ENV
-
 _OLD_VIRTUAL_PATH="$PATH"
-PATH="$VIRTUAL_ENV/bin:$PATH"
+PATH="{{target_dir}}/bin:$PATH"
 export PATH
 
 if ! [ -x "${PYTHONHOME+_}" ]; then
     _OLD_VIRTUAL_PYTHONHOME="$PYTHONHOME"
     unset PYTHONHOME
 fi
 
-VIRTUAL_ENV_PROMPT=$(basename "$VIRTUAL_ENV")
-export VIRTUAL_ENV_PROMPT
-
 _OLD_VIRTUAL_PS1="${PS1-}"
-PS1="(${VIRTUAL_ENV_PROMPT}) ${PS1-}"
+PS1="({{target_dir.name}}) ${PS1-}"
 export PS1
 
-ODK_RESOURCES_DIR="$VIRTUAL_ENV/resources"
+ODK_RESOURCES_DIR="{{target_dir}}/resources"
 export ODK_RESOURCES_DIR
 
 hash -r 2>/dev/null || true
+