From 1b4a7486c2df8a47df13300b11de9494fd5b8645 Mon Sep 17 00:00:00 2001
From: Laurent Bachelier <laurent@bachelier.name>
Date: Tue, 11 Jul 2017 16:59:42 +0200
Subject: [PATCH] tools: More powerful Python detection

Fill PYTHON2 and PYTHON3 variables. Allow override of everything.
Favor the generic version name because we expect the "better"
python2/python3 version to be set by the distribution.
---
 tools/common.sh | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/tools/common.sh b/tools/common.sh
index 74870d0349..85371fc8f6 100644
--- a/tools/common.sh
+++ b/tools/common.sh
@@ -1,17 +1,27 @@
 VER=2
-if [ "$1" = -3 ]; then
+if [ "${1-}" = "-3" ]; then
     VER=3
     shift
 fi
 
-if [ -z "${PYTHON}" ]; then
+
+if [ -z "${PYTHON2-}" ]; then
+    which python2.7 >/dev/null 2>&1 && PYTHON2=$(which python2.7)
+    which python2 >/dev/null 2>&1 && PYTHON2=$(which python2)
+fi
+
+if [ -z "${PYTHON3-}" ]; then
+    which python3.4 >/dev/null 2>&1 && PYTHON3=$(which python3.4)
+    which python3.5 >/dev/null 2>&1 && PYTHON3=$(which python3.5)
+    which python3.6 >/dev/null 2>&1 && PYTHON3=$(which python3.6)
+    which python3 >/dev/null 2>&1 && PYTHON3=$(which python3)
+fi
+
+if [ -z "${PYTHON-}" ]; then
     which python >/dev/null 2>&1 && PYTHON=$(which python)
-    which python$VER >/dev/null 2>&1 && PYTHON=$(which python$VER)
-    if [ $VER -eq 2 ]; then
-        which python2.7 >/dev/null 2>&1 && PYTHON=$(which python2.7)
-    else
-        which python3.4 >/dev/null 2>&1 && PYTHON=$(which python3.4)
-        which python3.5 >/dev/null 2>&1 && PYTHON=$(which python3.5)
-        which python3.6 >/dev/null 2>&1 && PYTHON=$(which python3.6)
+    if [ $VER -eq 2 -a -n "${PYTHON2}" ]; then
+        PYTHON=${PYTHON2}
+    elif [ $VER -eq 3 -a -n "${PYTHON3}" ]; then
+        PYTHON=${PYTHON3}
     fi
 fi
-- 
GitLab