coja/lbmk
1
0
Fork 0
mirror of https://codeberg.org/libreboot/lbmk.git synced 2026-07-19 09:32:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

init.sh: tidy up the python version check

Browse Source 
Signed-off-by: Leah Rowe <leah@libreboot.org>
This commit is contained in:
Leah Rowe
2025-05-04 08:47:12 +01:00
parent bbdc46b060
commit 342d570978
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/init.sh
+4 -7
View File
@@ -60,11 +60,9 @@ xbmk_set_pyver()
pybin "$python" 1>/dev/null || pyver="" pybin "$python" 1>/dev/null || pyver=""
[ -z "$pyver" ] || "`pybin "$python"`" -c "$pyv" 1>/dev/null \ [ -z "$pyver" ] || "`pybin "$python"`" -c "$pyv" 1>/dev/null \
2>/dev/null || $err "Cannot detect host Python version." 2>/dev/null || $err "Cannot detect host Python version."
if [ -n "$pyver" ]; then [ -n "$pyver" ] && \
pyver="$("$(pybin "$python")" -c "$pyv" | awk '{print $1}')" pyver="$("$(pybin "$python")" -c "$pyv" | awk '{print $1}')" && \
pyver="${pyver#(}" pyver="${pyver#(}" && pyver="${pyver%,}"
pyver="${pyver%,}"
fi
[ "${pyver%%.*}" = "3" ] || $err "Bad python version (must by 3.x)"; : [ "${pyver%%.*}" = "3" ] || $err "Bad python version (must by 3.x)"; :
} }
@@ -94,8 +92,7 @@ pybin()
[ -e "$pypath/$1" ] && [ ! -d "$pypath/$1" ] && \ [ -e "$pypath/$1" ] && [ ! -d "$pypath/$1" ] && \
[ -x "$pypath/$1" ] && printf "%s/%s\n" "$pypath" "$1" && \ [ -x "$pypath/$1" ] && printf "%s/%s\n" "$pypath" "$1" && \
return 0 return 0
done done && return 1
[ $venv -gt 0 ] && return 1
# Defer to normal command -v if not a venv # Defer to normal command -v if not a venv
command -v "$1" 2>/dev/null || return 1 command -v "$1" 2>/dev/null || return 1