Skip to content

Remove hard coded python versions and use > instead #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove hard coded python versions and use > instead #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions packaging/voxd.wrapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,12 @@ print(f"{sys.version_info.major}.{sys.version_info.minor}")
PY
)"
log "System Python version: $ver"
case "$ver" in
3.9|3.10|3.11|3.12|3.13) : ;;
*)
# Attempt to create a user-local venv with any newer Python found
# Check if version is >= 3.9
IFS='.' read -r major minor <<< "$ver"
if [[ "$major" -gt 3 ]] || [[ "$major" -eq 3 && "$minor" -ge 9 ]]; then
: # version is acceptable
else
# Attempt to create a user-local venv with any newer Python found
pick_python() {
for c in python3.12 python3.11 python3.10 python3.9 python3; do
if command -v "$c" >/dev/null 2>&1; then
Expand All @@ -56,10 +58,12 @@ import sys
print(f"{sys.version_info.major}.{sys.version_info.minor}")
PY
)"
case "$v" in
3.9|3.10|3.11|3.12|3.13) echo "$c"; return 0 ;;
*) : ;;
esac
# Check if version is >= 3.9
IFS='.' read -r v_major v_minor <<< "$v"
if [[ "$v_major" -gt 3 ]] || [[ "$v_major" -eq 3 && "$v_minor" -ge 9 ]]; then
echo "$c"
return 0
fi
fi
done
echo ""
Expand All @@ -86,8 +90,7 @@ PY
echo "[voxd] System Python $ver is unsupported and no newer Python was found. Use 'bash packaging/install_voxd.sh <rpm>' to provision a newer Python, or create $APPDIR/.venv with Python >= 3.9." >&2
exit 1
fi
;;
esac
fi
fi

# Ensure Python can import the embedded source tree
Expand Down