From a18d287a81ec2a0fc018cf61cfa150308ccdeb4d Mon Sep 17 00:00:00 2001 From: Alper Nebi Yasak Date: Mon, 21 Apr 2025 13:01:37 +0300 Subject: lib.sh: Fix python3 detection when 'python' is python2 Properly set $pyver to "3" when we detect we can use python3. In the following version checks, use the $python we detected instead of a 'python' from PATH because the latter might be a python2 while still co-existing with a python3. Signed-off-by: Alper Nebi Yasak --- include/lib.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'include/lib.sh') diff --git a/include/lib.sh b/include/lib.sh index 21066ecc..47b16100 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -99,13 +99,17 @@ done pyver="2" python="python3" -command -v python3 1>/dev/null || python="python" +if command -v python3 1>/dev/null; then + pyver="3" +else + python="python" +fi command -v $python 1>/dev/null || pyver="" [ -z "$pyver" ] || \ - python -c 'import sys; print(sys.version_info[:])' 1>/dev/null \ + $python -c 'import sys; print(sys.version_info[:])' 1>/dev/null \ 2>/dev/null || $err "Cannot determine which Python version." [ -n "$pyver" ] && \ - pyver="`python -c 'import sys; print(sys.version_info[:])' | \ + pyver="`$python -c 'import sys; print(sys.version_info[:])' | \ awk '{print $1}'`" && \ pyver="${pyver#(}" && pyver="${pyver%,}" if [ "${pyver%%.*}" != "3" ]; then -- cgit v1.2.1