From 3ae84f9aa2adef415ac0cf036fd8d33f5f6cfc41 Mon Sep 17 00:00:00 2001
From: goldyfruit <gaetan.trellu@gmail.com>
Date: Mon, 24 Jun 2024 10:16:05 -0400
Subject: [PATCH 1/4] Fix issue #91 with Python version

---
 utils/common.sh    | 29 ++++++-----------------------
 utils/constants.sh |  1 -
 2 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/utils/common.sh b/utils/common.sh
index 2335f759..b95bafe5 100644
--- a/utils/common.sh
+++ b/utils/common.sh
@@ -198,8 +198,6 @@ function get_os_information() {
 # the installer will exit with a message.
 function required_packages() {
     echo -ne "➤ Validating installer package requirements... "
-    PYTHON_VERSION="$MAX_PYTHON_VERSION"
-
     # Add extra packages if a Raspberry Pi board is detected
     declare extra_packages
     if [ "$RASPBERRYPI_MODEL" != "N/A" ]; then
@@ -209,34 +207,19 @@ function required_packages() {
 
     case "$DISTRO_NAME" in
     debian | ubuntu | raspbian | linuxmint | zorin)
-        [ "$DISTRO_VERSION_ID" == "11" ] && export PYTHON_VERSION="3"
-        # This is a temporary fix until OVOS is confirmed to work with
-        # Python 3.12. Requirements are PocketSphinx, tflite-runtime and
-        # onnxruntime Python packages.
-        if [ "$(ver "$DISTRO_VERSION_ID")" -ge "$(ver 24.04)" ]; then
-            {
-                apt-get update
-                apt-get install --no-install-recommends -y software-properties-common
-                add-apt-repository ppa:deadsnakes/ppa -y
-            } &>>"$LOG_FILE"
-        fi
         apt-get update &>>"$LOG_FILE"
-        apt-get install --no-install-recommends -y "python${PYTHON_VERSION}" "python${PYTHON_VERSION}-dev" python3-pip "python${PYTHON_VERSION}-venv" whiptail expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
+        apt-get install --no-install-recommends -y "python3" "python3-dev" python3-pip "python3-venv" whiptail expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
         ;;
     fedora)
-        export PYTHON_VERSION
-        dnf install -y python3.11 python3.11-devel python3-pip python3-virtualenv newt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
+        dnf install -y python3 python3-devel python3-pip python3-virtualenv newt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
         ;;
     rocky | centos)
-        export PYTHON_VERSION
-        dnf install -y python3.11 python3.11-devel python3-pip newt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
+        dnf install -y python3 python3-devel python3-pip newt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
         ;;
     opensuse-tumbleweed | opensuse-leap)
-        export PYTHON_VERSION
-        zypper install -y python311 python311-devel python3-pip python3-rpm newt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
+        zypper install -y python3 python3-devel python3-pip python3-rpm newt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
         ;;
     arch | manjaro | endeavouros)
-        export PYTHON_VERSION
         pacman -Sy --noconfirm python python-pip python-virtualenv libnewt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
         ;;
     *)
@@ -262,14 +245,14 @@ function create_python_venv() {
     fi
 
     if [ ! -d "$VENV_PATH" ]; then
-        "python${PYTHON_VERSION}" -m venv "$VENV_PATH" &>>"$LOG_FILE"
+        python3 -m venv "$VENV_PATH" &>>"$LOG_FILE"
     fi
 
     # shellcheck source=/dev/null
     source "$VENV_PATH/bin/activate"
 
     pip3 install --upgrade pip setuptools &>>"$LOG_FILE"
-    chown "$RUN_AS":"$(id -ng "$RUN_AS")" "$VENV_PATH"
+    chown "$RUN_AS":"$(id -ng "$RUN_AS")" "$VENV_PATH" &>>"$LOG_FILE"
     echo -e "[$done_format]"
 }
 
diff --git a/utils/constants.sh b/utils/constants.sh
index 77e5782d..fc3982b8 100644
--- a/utils/constants.sh
+++ b/utils/constants.sh
@@ -11,7 +11,6 @@ export DT_FILE=/sys/firmware/devicetree/base/model
 export I2C_BUS="1"
 export INSTALLER_VENV_NAME="ovos-installer"
 export LOG_FILE=/var/log/ovos-installer.log
-export MAX_PYTHON_VERSION="3.11"
 export NEWT_COLORS="
     root=white,black
     border=black,lightgray

From 7fb4be2db8750284af6bcda44198a9e246466203 Mon Sep 17 00:00:00 2001
From: goldyfruit <gaetan.trellu@gmail.com>
Date: Mon, 24 Jun 2024 10:24:58 -0400
Subject: [PATCH 2/4] [utils/common] Remove quotes

---
 utils/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/common.sh b/utils/common.sh
index b95bafe5..bb0a7ff5 100644
--- a/utils/common.sh
+++ b/utils/common.sh
@@ -208,7 +208,7 @@ function required_packages() {
     case "$DISTRO_NAME" in
     debian | ubuntu | raspbian | linuxmint | zorin)
         apt-get update &>>"$LOG_FILE"
-        apt-get install --no-install-recommends -y "python3" "python3-dev" python3-pip "python3-venv" whiptail expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
+        apt-get install --no-install-recommends -y python3 python3-dev python3-pip python3-venv whiptail expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
         ;;
     fedora)
         dnf install -y python3 python3-devel python3-pip python3-virtualenv newt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"

From 9d9da02d22bfe1a5f96a8a47f6ee65036b77e041 Mon Sep 17 00:00:00 2001
From: goldyfruit <gaetan.trellu@gmail.com>
Date: Mon, 24 Jun 2024 10:25:12 -0400
Subject: [PATCH 3/4] [utils/common] Add no-recommends to zypper install

---
 utils/common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/common.sh b/utils/common.sh
index bb0a7ff5..d8e0499e 100644
--- a/utils/common.sh
+++ b/utils/common.sh
@@ -217,7 +217,7 @@ function required_packages() {
         dnf install -y python3 python3-devel python3-pip newt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
         ;;
     opensuse-tumbleweed | opensuse-leap)
-        zypper install -y python3 python3-devel python3-pip python3-rpm newt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
+        zypper install --no-recommends -y python3 python3-devel python3-pip python3-rpm newt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"
         ;;
     arch | manjaro | endeavouros)
         pacman -Sy --noconfirm python python-pip python-virtualenv libnewt expect jq "${extra_packages[@]}" &>>"$LOG_FILE"

From 8b69ef2abdf1c2ced61ca03d9594f779a69c3314 Mon Sep 17 00:00:00 2001
From: goldyfruit <gaetan.trellu@gmail.com>
Date: Mon, 24 Jun 2024 10:25:39 -0400
Subject: [PATCH 4/4] [utils/common] Always starts with a clean venv for the
 installer

---
 utils/common.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils/common.sh b/utils/common.sh
index d8e0499e..60a339fd 100644
--- a/utils/common.sh
+++ b/utils/common.sh
@@ -244,9 +244,10 @@ function create_python_venv() {
         fi
     fi
 
-    if [ ! -d "$VENV_PATH" ]; then
-        python3 -m venv "$VENV_PATH" &>>"$LOG_FILE"
+    if [ -d "$VENV_PATH" ]; then
+        rm -rf "$VENV_PATH" &>>"$LOG_FILE"
     fi
+    python3 -m venv "$VENV_PATH" &>>"$LOG_FILE"
 
     # shellcheck source=/dev/null
     source "$VENV_PATH/bin/activate"