From cae48b85bf86d54b6ede0c4f2a419c346e8221ea Mon Sep 17 00:00:00 2001
From: Chris Osborn <fozztexx@fozztexx.com>
Date: Wed, 15 Jan 2025 11:34:48 -0800
Subject: [PATCH] Be smarter about finding python3

---
 build.sh | 41 +++++++++++++++++++++++++++++++++++------
 1 file changed, 35 insertions(+), 6 deletions(-)

diff --git a/build.sh b/build.sh
index a29180b9d..74eb923ee 100755
--- a/build.sh
+++ b/build.sh
@@ -28,6 +28,35 @@ CMAKE_GENERATOR=""
 INI_FILE="${SCRIPT_DIR}/platformio-generated.ini"
 LOCAL_INI_VALUES_FILE="${SCRIPT_DIR}/platformio.local.ini"
 
+# Function to check if the specified Python version is 3
+check_python_version() {
+  local python_bin=$1
+
+  if ! command -v "${python_bin}" &> /dev/null; then
+    return 1
+  fi
+
+  # Extract the major version number
+  local major_version="$(${python_bin} --version 2>&1 | cut -d' ' -f2 | cut -d'.' -f1)"
+
+  # Verify if it's Python 3
+  if [ "${major_version}" -eq 3 ]; then
+    return 0
+  else
+    return 1
+  fi
+}
+
+# Check if "python" exists first since that's what PlatformIO names it
+PYTHON=python
+if ! check_python_version "${PYTHON}" ; then
+  PYTHON=python3
+  if ! check_python_version "${PYTHON}" ; then
+    echo "Python 3 is not installed"
+    exit 1
+  fi
+fi
+
 function display_board_names {
   while IFS= read -r piofile; do
     BOARD_NAME=$(echo $(basename $piofile) | sed 's#^platformio-##;s#.ini$##')
@@ -186,7 +215,7 @@ if [ ! -z "$PC_TARGET" ] ; then
   # python_modules.txt contains pairs of module name and installable package names, separated by pipe symbol
   MOD_LIST=$(sed '/^#/d' < "${SCRIPT_DIR}/python_modules.txt" | cut -d\| -f1 | tr '\n' ' ' | sed 's# *$##;s# \{1,\}# #g')
   echo "Checking python modules installed: $MOD_LIST"
-  python -c "import importlib.util, sys; sys.exit(0 if all(importlib.util.find_spec(mod.strip()) for mod in '''$MOD_LIST'''.split()) else 1)"
+  ${PYTHON} -c "import importlib.util, sys; sys.exit(0 if all(importlib.util.find_spec(mod.strip()) for mod in '''$MOD_LIST'''.split()) else 1)"
   if [ $? -eq 1 ] ; then
     echo "At least one of the required python modules is missing"
     bash ${SCRIPT_DIR}/install_python_modules.sh
@@ -230,14 +259,14 @@ if [ -z "$SETUP_NEW_BOARD" ] ; then
   fi
 
   if [ ${ZIP_MODE} -eq 1 ] ; then
-    python create-platformio-ini.py -o $INI_FILE -l $LOCAL_INI_VALUES_FILE -f platformio-ini-files/platformio.zip-options.ini
+    ${PYTHON} create-platformio-ini.py -o $INI_FILE -l $LOCAL_INI_VALUES_FILE -f platformio-ini-files/platformio.zip-options.ini
   else
-    python create-platformio-ini.py -o $INI_FILE -l $LOCAL_INI_VALUES_FILE
+    ${PYTHON} create-platformio-ini.py -o $INI_FILE -l $LOCAL_INI_VALUES_FILE
   fi
   create_result=$?
 else
   # this will create a clean platformio INI file, but honours the command line args
-  if [ $ANSWER_YES -eq 0 ] ; then
+  if [ -e ${LOCAL_INI_VALUES_FILE} -a $ANSWER_YES -eq 0 ] ; then
     echo "WARNING! This will potentially overwrite any local changes in $LOCAL_INI_VALUES_FILE"
     echo -n "Do you want to proceed? (y|N) "
     read answer
@@ -248,9 +277,9 @@ else
     fi
   fi
   if [ ${ZIP_MODE} -eq 1 ] ; then
-    python create-platformio-ini.py -n $SETUP_NEW_BOARD -o $INI_FILE -l $LOCAL_INI_VALUES_FILE -f platformio-ini-files/platformio.zip-options.ini
+    ${PYTHON} create-platformio-ini.py -n $SETUP_NEW_BOARD -o $INI_FILE -l $LOCAL_INI_VALUES_FILE -f platformio-ini-files/platformio.zip-options.ini
   else
-    python create-platformio-ini.py -n $SETUP_NEW_BOARD -o $INI_FILE -l $LOCAL_INI_VALUES_FILE
+    ${PYTHON} create-platformio-ini.py -n $SETUP_NEW_BOARD -o $INI_FILE -l $LOCAL_INI_VALUES_FILE
   fi
 
   create_result=$?