From 5882d6b1d5b717a611e28f33682d9371b3be4e5d Mon Sep 17 00:00:00 2001
From: thePR0M3TH3AN <53631862+PR0M3TH3AN@users.noreply.github.com>
Date: Sun, 6 Jul 2025 20:29:01 -0400
Subject: [PATCH] Improve Python detection in Windows installer

---
 README.md           |  4 +++-
 scripts/install.ps1 | 34 ++++++++++++++++++++++++++++++----
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 587381a..0ee1d5d 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,9 @@ bash -c "$(curl -sSL https://raw.githubusercontent.com/PR0M3TH3AN/SeedPass/main/
 ```powershell
 Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; $scriptContent = (New-Object System.Net.WebClient).DownloadString('https://raw.githubusercontent.com/PR0M3TH3AN/SeedPass/main/scripts/install.ps1'); & ([scriptblock]::create($scriptContent))
 ```
-The Windows installer will attempt to install Git automatically if it is not already available.
+The Windows installer will attempt to install Git automatically if it is not already available. It also tries to
+install Python 3 using `winget`, `choco`, or `scoop` when Python is missing and recognizes the `py` launcher if `python`
+isn't on your PATH.
 **Note:** If you are using Python 3.13 or newer, install the [Microsoft Visual C++ Build Tools](https://visualstudio.microsoft.com/visual-cpp-build-tools/) and reopen PowerShell before rerunning the installer.
 *Install the beta branch:*
 ```powershell
diff --git a/scripts/install.ps1 b/scripts/install.ps1
index 2971632..c6db8f8 100644
--- a/scripts/install.ps1
+++ b/scripts/install.ps1
@@ -84,11 +84,37 @@ if (-not (Get-Command git -ErrorAction SilentlyContinue)) {
         }
     }
 }
-$pythonExe = Get-Command python -ErrorAction SilentlyContinue
-if (-not $pythonExe) { Write-Error "Python 3 is not installed or not in your PATH. Please install it from https://www.python.org/" }
+
+function Get-PythonCommand {
+    $cmd = Get-Command python -ErrorAction SilentlyContinue
+    if ($cmd) { return ,('python') }
+    $cmd = Get-Command py -ErrorAction SilentlyContinue
+    if ($cmd) { return @('py','-3') }
+    return $null
+}
+
+$PythonCmd = Get-PythonCommand
+if (-not $PythonCmd) {
+    Write-Warning "Python 3 is not installed. Attempting to install..."
+    if (Get-Command winget -ErrorAction SilentlyContinue) {
+        try { winget install --id Python.Python.3 -e --source winget -h } catch { Write-Warning "Failed to install Python via winget." }
+    } elseif (Get-Command choco -ErrorAction SilentlyContinue) {
+        try { choco install python -y } catch { Write-Warning "Failed to install Python via Chocolatey." }
+    } elseif (Get-Command scoop -ErrorAction SilentlyContinue) {
+        try { scoop install python } catch { Write-Warning "Failed to install Python via Scoop." }
+    } else {
+        Write-Error "Python 3 is not installed. Please install it from https://www.python.org/ and ensure it's in your PATH."
+    }
+    $env:Path = [System.Environment]::GetEnvironmentVariable('Path','Machine') + ';' +
+                 [System.Environment]::GetEnvironmentVariable('Path','User')
+    $PythonCmd = Get-PythonCommand
+    if (-not $PythonCmd) {
+        Write-Error "Python installation succeeded but python not found in PATH. Please open a new terminal or add Python to PATH manually."
+    }
+}
 
 # Warn about unsupported Python versions
-$pyVersionString = (& python --version) -replace '[^0-9\.]', ''
+$pyVersionString = (& $PythonCmd --version) -replace '[^0-9\.]', ''
 try { $pyVersion = [version]$pyVersionString } catch { $pyVersion = $null }
 if ($pyVersion -and $pyVersion.Major -eq 3 -and $pyVersion.Minor -ge 13) {
     Write-Warning "Python $pyVersionString detected. Some dependencies may not have prebuilt wheels yet."
@@ -119,7 +145,7 @@ if (Test-Path (Join-Path $InstallDir ".git")) {
 # 3. Set up Python virtual environment
 Write-Info "Setting up Python virtual environment..."
 if (-not (Test-Path $VenvDir)) {
-    try { python -m venv $VenvDir } catch { Write-Error "Failed to create virtual environment. Error: $_" }
+    try { & $PythonCmd -m venv $VenvDir } catch { Write-Error "Failed to create virtual environment. Error: $_" }
 }
 
 # 4. Install/Update Python dependencies