diff options
| author | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-10-02 10:36:16 (GMT) |
|---|---|---|
| committer | Vinay Sajip <vinay_sajip@yahoo.co.uk> | 2013-10-02 10:36:16 (GMT) |
| commit | dff9e2535f5bf73f1491edc45928eef51a701074 (patch) | |
| tree | a8345bf9e94fb6095a0eb41da069232184009fe1 /Lib/venv/scripts/posix | |
| parent | 7c411a40413d9525aeb6114d71be3e012dbf81f5 (diff) | |
| download | cpython-dff9e2535f5bf73f1491edc45928eef51a701074.zip cpython-dff9e2535f5bf73f1491edc45928eef51a701074.tar.gz cpython-dff9e2535f5bf73f1491edc45928eef51a701074.tar.bz2 | |
Closes #19139: Changed usage of __VENV_NAME__ and added __VENV_PROMPT__.
Diffstat (limited to 'Lib/venv/scripts/posix')
| -rw-r--r-- | Lib/venv/scripts/posix/activate | 4 | ||||
| -rw-r--r-- | Lib/venv/scripts/posix/activate.fish | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Lib/venv/scripts/posix/activate b/Lib/venv/scripts/posix/activate index c241450..7bbffd9 100644 --- a/Lib/venv/scripts/posix/activate +++ b/Lib/venv/scripts/posix/activate @@ -54,8 +54,8 @@ fi if [ -z "$VIRTUAL_ENV_DISABLE_PROMPT" ] ; then _OLD_VIRTUAL_PS1="$PS1" - if [ "x__VENV_NAME__" != x ] ; then - PS1="__VENV_NAME__$PS1" + if [ "x__VENV_PROMPT__" != x ] ; then + PS1="__VENV_PROMPT__$PS1" else if [ "`basename \"$VIRTUAL_ENV\"`" = "__" ] ; then # special case for Aspen magic directories diff --git a/Lib/venv/scripts/posix/activate.fish b/Lib/venv/scripts/posix/activate.fish index 5ac1638..45391aa 100644 --- a/Lib/venv/scripts/posix/activate.fish +++ b/Lib/venv/scripts/posix/activate.fish @@ -55,8 +55,8 @@ if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" # with the original prompt function renamed, we can override with our own. function fish_prompt # Prompt override? - if test -n "__VENV_NAME__" - printf "%s%s%s" "__VENV_NAME__" (set_color normal) (_old_fish_prompt) + if test -n "__VENV_PROMPT__" + printf "%s%s%s" "__VENV_PROMPT__" (set_color normal) (_old_fish_prompt) return end # ...Otherwise, prepend env |