From 9543a325acbed4ad58294fe97556ef2acc9e961b Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 23 Apr 2025 04:31:40 +0100 Subject: lib.sh: further simplify the python check Signed-off-by: Leah Rowe --- include/lib.sh | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'include') diff --git a/include/lib.sh b/include/lib.sh index 45eb2b3d..eda338a0 100644 --- a/include/lib.sh +++ b/include/lib.sh @@ -98,13 +98,9 @@ for fv in version versiondate; do eval "[ ! -f \".$fv\" ] || read -r $fv < \".$fv\" || :" done -pyver="2" python="python3" -if command -v python3 1>/dev/null; then - pyver="3" -else - python="python" -fi +command -v python3 1>/dev/null || python="python" +pyver="2" && [ "$python" = "python3" ] && pyver="3" command -v $python 1>/dev/null || pyver="" [ -z "$pyver" ] || \ $python -c 'import sys; print(sys.version_info[:])' 1>/dev/null \ -- cgit v1.2.1