From 7959acddd90150e93d5c866de65f7cd7110190e7 Mon Sep 17 00:00:00 2001 From: Gurkirat Singh Date: Sun, 10 Jan 2021 19:28:34 +0530 Subject: [PATCH 1/2] formatted pip pip3 and pipenv completion and used helper functions --- completion/available/pip.completion.bash | 4 ++-- completion/available/pip3.completion.bash | 4 ++-- completion/available/pipenv.completion.bash | 5 ++++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/completion/available/pip.completion.bash b/completion/available/pip.completion.bash index 618909ad..df790073 100644 --- a/completion/available/pip.completion.bash +++ b/completion/available/pip.completion.bash @@ -5,6 +5,6 @@ # If the pip package is installed within virtual environments, say, python managed by pyenv, # you should first initilization the corresponding environment. # So that the pip/pip3 is in system's path. -if command -v pip >/dev/null; then - eval "$(pip completion --bash)" +if _command_exists pip; then + eval "$(pip completion --bash)" fi diff --git a/completion/available/pip3.completion.bash b/completion/available/pip3.completion.bash index 1e2ffb42..7662f2e8 100644 --- a/completion/available/pip3.completion.bash +++ b/completion/available/pip3.completion.bash @@ -5,6 +5,6 @@ # If the pip package is installed within virtual environments, say, python managed by pyenv, # you should first initilization the corresponding environment. # So that the pip/pip3 is in system's path. -if command -v pip3 >/dev/null; then - eval "$(pip3 completion --bash)" +if _command_exists pip3; then + eval "$(pip3 completion --bash)" fi diff --git a/completion/available/pipenv.completion.bash b/completion/available/pipenv.completion.bash index 339509f2..1787fed0 100644 --- a/completion/available/pipenv.completion.bash +++ b/completion/available/pipenv.completion.bash @@ -1 +1,4 @@ -[[ -x "$(which pipenv)" ]] && eval "$(pipenv --completion)" +if _command_exists pipenv +then + eval "$(pipenv --completion)" +fi From 5df1e653d928f5f82caea09eb4220373050f9e66 Mon Sep 17 00:00:00 2001 From: Noah Gorny Date: Sat, 16 Jan 2021 22:33:37 +0200 Subject: [PATCH 2/2] completion: pip: Lint all pip files and clarify comment --- clean_files.txt | 3 +++ completion/available/pip.completion.bash | 11 ++++++----- completion/available/pip3.completion.bash | 11 ++++++----- completion/available/pipenv.completion.bash | 6 +++--- 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/clean_files.txt b/clean_files.txt index ddafc469..54cf3152 100644 --- a/clean_files.txt +++ b/clean_files.txt @@ -68,6 +68,9 @@ completion/available/github-cli.completion.bash completion/available/helm.completion.bash completion/available/knife.completion.bash completion/available/packer.completion.bash +completion/available/pip.completion.bash +completion/available/pip3.completion.bash +completion/available/pipenv.completion.bash completion/available/pipx.completion.bash completion/available/rustup.completion.bash completion/available/vault.completion.bash diff --git a/completion/available/pip.completion.bash b/completion/available/pip.completion.bash index df790073..7ed8c17e 100644 --- a/completion/available/pip.completion.bash +++ b/completion/available/pip.completion.bash @@ -1,10 +1,11 @@ +# shellcheck shell=bash + # https://pip.pypa.io/en/stable/user_guide/#command-completion -# Of course, you should first install the pip, say on Debian: +# Of course, you should first install pip, say on Debian: # sudo apt-get install python-pip -# sudo apt-get install python3-pip # If the pip package is installed within virtual environments, say, python managed by pyenv, -# you should first initilization the corresponding environment. -# So that the pip/pip3 is in system's path. +# you should first initialize the corresponding environment. +# So that pip is in the system's path. if _command_exists pip; then - eval "$(pip completion --bash)" + eval "$(pip completion --bash)" fi diff --git a/completion/available/pip3.completion.bash b/completion/available/pip3.completion.bash index 7662f2e8..c2b58564 100644 --- a/completion/available/pip3.completion.bash +++ b/completion/available/pip3.completion.bash @@ -1,10 +1,11 @@ +# shellcheck shell=bash + # https://pip.pypa.io/en/stable/user_guide/#command-completion -# Of course, you should first install the pip, say on Debian: -# sudo apt-get install python-pip +# Of course, you should first install pip, say on Debian: # sudo apt-get install python3-pip # If the pip package is installed within virtual environments, say, python managed by pyenv, -# you should first initilization the corresponding environment. -# So that the pip/pip3 is in system's path. +# you should first initialize the corresponding environment. +# So that pip3 is in the system's path. if _command_exists pip3; then - eval "$(pip3 completion --bash)" + eval "$(pip3 completion --bash)" fi diff --git a/completion/available/pipenv.completion.bash b/completion/available/pipenv.completion.bash index 1787fed0..52451b8a 100644 --- a/completion/available/pipenv.completion.bash +++ b/completion/available/pipenv.completion.bash @@ -1,4 +1,4 @@ -if _command_exists pipenv -then - eval "$(pipenv --completion)" +# shellcheck shell=bash +if _command_exists pipenv; then + eval "$(pipenv --completion)" fi