find_python.sh: search in more paths (python, /usr/bin/python etc.)

Signed-off-by: Yaroslav Brustinov <[email protected]>

diff --git a/scripts/find_python.sh b/scripts/find_python.sh
index 4a3452c..12b173b 100755 (executable)
--- a/scripts/find_python.sh
+++ b/scripts/find_python.sh
@@ -4,31 +4,21 @@ set +e
 
 # function finds python2
 function find_python2 {
-    # two candidates - machine python and cisco linux python
 
     if [ -n "$PYTHON" ]; then #  
         return;
     fi
-    
-    
-    MACHINE_PYTHON=python
-    CEL_PYTHON=/router/bin/python-2.7.4
 
-    # try the machine python
-    PYTHON=$MACHINE_PYTHON
-    PCHECK=`$PYTHON -c "import sys; ver = sys.version_info[0] * 10 + sys.version_info[1];sys.exit(ver < 27)" > /dev/null 2>&1 ` 
-    if [ $? -eq 0 ]; then
-        return
-    fi
-
-    # try the CEL python
-    PYTHON=$CEL_PYTHON
-    PCHECK=`$PYTHON -c "import sys; ver = sys.version_info[0] * 10 + sys.version_info[1];sys.exit(ver < 27)" > /dev/null 2>&1 ` 
-    if [ $? -eq 0 ]; then
-        return
-    fi
+    # try different Python paths
+    PYTHONS=( python /usr/bin/python /router/bin/python-2.7.4 )
+    for PYTHON in ${PYTHONS[*]}; do
+        $PYTHON -c "import sys; ver = sys.version_info[0] * 10 + sys.version_info[1];sys.exit(ver < 27)" > /dev/null 2>&1
+        if [ $? -eq 0 ]; then
+            return
+        fi
+    done;
 
-    echo "*** $MACHINE_PYTHON - python version is too old, 2.7 at least is required"
+    echo "*** Python version is too old, 2.7 at least is required"
     exit -1
 }
 
@@ -40,19 +30,16 @@ function find_python3 {
         return;
     fi
 
-    MACHINE_PYTHON=python3
-    ITAY_PYTHON=/auto/proj-pcube-b/apps/PL-b/tools/python3.4/bin/python3
-    PYTHON=$MACHINE_PYTHON
-    PCHECK=`$PYTHON -c "import sys; ver = sys.version_info[0] * 10 + sys.version_info[1];sys.exit(ver != 34 and ver != 35)" > /dev/null 2>&1 ` 
-    if [ $? -eq 0 ]; then
-        return
-    fi
-    PYTHON=$ITAY_PYTHON
-    PCHECK=`$PYTHON -c "import sys; ver = sys.version_info[0] * 10 + sys.version_info[1];sys.exit(ver != 34 and ver != 35)" > /dev/null 2>&1 ` 
-    if [ $? -eq 0 ]; then
-        return
-    fi
-    echo "*** $MACHINE_PYTHON - python version does not match, 3.4 or 3.5 is required"
+    # try different Python3 paths
+    PYTHONS=( python3 /usr/bin/python3 /auto/proj-pcube-b/apps/PL-b/tools/python3.4/bin/python3 )
+    for PYTHON in ${PYTHONS[*]}; do
+        $PYTHON -c "import sys; ver = sys.version_info[0] * 10 + sys.version_info[1];sys.exit(ver != 34 and ver != 35)" > /dev/null 2>&1
+        if [ $? -eq 0 ]; then
+            return
+        fi
+    done;
+
+    echo "*** Python3 version does not match, 3.4 or 3.5 is required"
     exit -1
 }