Add a get_pip_command function
There are two places where we need to find the right command for pip, so
instead of having one version we fix and a buggy version we forget,
simply use a function :-)
Change-Id: I728c17ad7be5c86690c4d7907f77f1f98ec2b815
diff --git a/functions b/functions
index 9022675..bc6fdc3 100644
--- a/functions
+++ b/functions
@@ -645,11 +645,7 @@
SUDO_PIP="env"
else
SUDO_PIP="sudo"
- if [[ "$os_PACKAGE" = "deb" ]] || is_suse; then
- CMD_PIP=/usr/bin/pip
- else
- CMD_PIP=/usr/bin/pip-python
- fi
+ CMD_PIP=$(get_pip_command)
fi
if [[ "$PIP_USE_MIRRORS" != "False" ]]; then
PIP_MIRROR_OPT="--use-mirrors"
@@ -1046,6 +1042,19 @@
fi
}
+# Get the path to the pip command.
+# get_pip_command
+function get_pip_command() {
+ if [[ -z "$os_PACKAGE" ]]; then
+ GetOSVersion
+ fi
+
+ if [[ "$os_PACKAGE" = "deb" ]] || is_suse; then
+ echo "/usr/bin/pip"
+ else
+ echo "/usr/bin/pip-python"
+ fi
+}
# Check if qpid can be used on the current distro.
# qpid_is_supported
diff --git a/tools/info.sh b/tools/info.sh
index 5c9a1d3..a872d59 100755
--- a/tools/info.sh
+++ b/tools/info.sh
@@ -107,11 +107,7 @@
# Pips
# ----
-if [[ "$os_PACKAGE" = "deb" ]]; then
- CMD_PIP=/usr/bin/pip
-else
- CMD_PIP=/usr/bin/pip-python
-fi
+CMD_PIP=$(get_pip_command)
# Pip tells us what is currently installed
FREEZE_FILE=$(mktemp --tmpdir freeze.XXXXXX)