thePR0M3TH3AN/seedPass
1
0
Fork 0
mirror of https://github.com/PR0M3TH3AN/SeedPass.git synced 2025-09-09 15:58:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #341 from PR0M3TH3AN/codex/update-install-scripts-to-check-for-python

Browse Source 
Improve Python detection for Windows installer
This commit is contained in:
thePR0M3TH3AN
2025-07-06 20:50:24 -04:00
committed by GitHub
parent 85271e64b9 c8a4f67651
commit 77dc7ad6c2
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@@ -78,7 +78,10 @@ bash -c "$(curl -sSL https://raw.githubusercontent.com/PR0M3TH3AN/SeedPass/main/
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)) 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. It also tries to 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.
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. **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:* *Install the beta branch:*
```powershell ```powershell

31
scripts/install.ps1
View File

@@ -84,8 +84,18 @@ if (-not (Get-Command git -ErrorAction SilentlyContinue)) {
} }
} }
} }
$pythonExe = Get-Command python -ErrorAction SilentlyContinue
if (-not $pythonExe) { # 🔧 merged conflicting changes from update-install-scripts-to-check-for-python vs main
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..." Write-Warning "Python 3 is not installed. Attempting to install..."
if (Get-Command winget -ErrorAction SilentlyContinue) { 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." } try { winget install --id Python.Python.3 -e --source winget -h } catch { Write-Warning "Failed to install Python via winget." }
@@ -96,17 +106,18 @@ if (-not $pythonExe) {
} else { } else {
Write-Error "Python 3 is not installed. Please install it from https://www.python.org/ and ensure it's in your PATH." Write-Error "Python 3 is not installed. Please install it from https://www.python.org/ and ensure it's in your PATH."
} }
if (-not (Get-Command python -ErrorAction SilentlyContinue)) {
$env:Path = [System.Environment]::GetEnvironmentVariable('Path','Machine') + ';' + # 🔧 merged conflicting changes from update-install-scripts-to-check-for-python vs main
[System.Environment]::GetEnvironmentVariable('Path','User') $env:Path = [System.Environment]::GetEnvironmentVariable('Path','Machine') + ';' +
if (-not (Get-Command python -ErrorAction SilentlyContinue)) { [System.Environment]::GetEnvironmentVariable('Path','User')
Write-Error "Python installation succeeded but python not found in PATH. Please open a new terminal or add Python to PATH manually." $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 # Warn about unsupported Python versions
$pyVersionString = (& python --version) -replace '[^0-9\.]', '' $pyVersionString = (& $PythonCmd --version) -replace '[^0-9\.]', ''
try { $pyVersion = [version]$pyVersionString } catch { $pyVersion = $null } try { $pyVersion = [version]$pyVersionString } catch { $pyVersion = $null }
if ($pyVersion -and $pyVersion.Major -eq 3 -and $pyVersion.Minor -ge 13) { 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." Write-Warning "Python $pyVersionString detected. Some dependencies may not have prebuilt wheels yet."
@@ -137,7 +148,7 @@ if (Test-Path (Join-Path $InstallDir ".git")) {
# 3. Set up Python virtual environment # 3. Set up Python virtual environment
Write-Info "Setting up Python virtual environment..." Write-Info "Setting up Python virtual environment..."
if (-not (Test-Path $VenvDir)) { 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 # 4. Install/Update Python dependencies