From db64f5521c9efc66235b4ce1c93129f85fa42f19 Mon Sep 17 00:00:00 2001 From: Hongyi Zhao Date: Fri, 13 Mar 2020 19:56:56 +0800 Subject: [PATCH] FIXME: do the trick without exporting variable into environment. Use _pip_completion_bash as the hook function name --- completion/available/pip.completion.bash | 5 +++-- completion/available/pip3.completion.bash | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/completion/available/pip.completion.bash b/completion/available/pip.completion.bash index ebbd41aa..728c97c8 100644 --- a/completion/available/pip.completion.bash +++ b/completion/available/pip.completion.bash @@ -38,7 +38,7 @@ function safe_append_prompt_command { } -_pip_completion_hook() { +_pip_completion_bash() { local _pip # For pip resides within the pyenv/virtualenv/venv/conda environments: if [ -n "$VIRTUAL_ENV" ] && [ -x "$VIRTUAL_ENV/bin/pip" ]; then @@ -49,6 +49,7 @@ _pip_completion_hook() { elif [ -x /usr/bin/pip ]; then _pip=/usr/bin/pip fi + # FIXME: do the trick without exporting variable into environment: if [ -n "$_pip" ]; then if [ -z "$_pip_command_path" ] || [ "$_pip_command_path" != "$_pip" ]; then eval "$($_pip completion --bash)" @@ -58,6 +59,6 @@ _pip_completion_hook() { unset _pip } -safe_append_prompt_command _pip_completion_hook +safe_append_prompt_command _pip_completion_bash diff --git a/completion/available/pip3.completion.bash b/completion/available/pip3.completion.bash index acc78166..b32e03e8 100644 --- a/completion/available/pip3.completion.bash +++ b/completion/available/pip3.completion.bash @@ -38,7 +38,7 @@ function safe_append_prompt_command { } -_pip_completion_hook() { +_pip_completion_bash() { local _pip # For pip resides within the pyenv/virtualenv/venv/conda environments: if [ -n "$VIRTUAL_ENV" ] && [ -x "$VIRTUAL_ENV/bin/pip3" ]; then @@ -49,6 +49,7 @@ _pip_completion_hook() { elif [ -x /usr/bin/pip3 ]; then _pip=/usr/bin/pip3 fi + # FIXME: do the trick without exporting variable into environment: if [ -n "$_pip" ]; then if [ -z "$_pip_command_path" ] || [ "$_pip_command_path" != "$_pip" ]; then eval "$($_pip completion --bash)" @@ -58,6 +59,6 @@ _pip_completion_hook() { unset _pip } -safe_append_prompt_command _pip_completion_hook +safe_append_prompt_command _pip_completion_bash