mirror of
https://github.com/PR0M3TH3AN/SeedPass.git
synced 2025-09-08 07:18:47 +00:00
Merge branch 'main' into codex/update-install-scripts-to-check-for-python
This commit is contained in:
@@ -78,8 +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 and recognizes the `py` launcher if `python`
|
install Python 3 using `winget`, `choco`, or `scoop` when Python is missing and recognizes the `py` launcher if `python`
|
||||||
isn't on your PATH.
|
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
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
#
|
#
|
||||||
# SeedPass Universal Installer for Windows
|
# SeedPass Universal Installer for Windows
|
||||||
#
|
#
|
||||||
# Supports installing from a specific branch using the -Branch parameter.
|
# Supports installing from a specific branch using the -Branch parameter.
|
||||||
@@ -85,6 +85,7 @@ if (-not (Get-Command git -ErrorAction SilentlyContinue)) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# 🔧 merged conflicting changes from update-install-scripts-to-check-for-python vs main
|
||||||
function Get-PythonCommand {
|
function Get-PythonCommand {
|
||||||
$cmd = Get-Command python -ErrorAction SilentlyContinue
|
$cmd = Get-Command python -ErrorAction SilentlyContinue
|
||||||
if ($cmd) { return ,('python') }
|
if ($cmd) { return ,('python') }
|
||||||
@@ -105,6 +106,8 @@ if (-not $PythonCmd) {
|
|||||||
} 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."
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# 🔧 merged conflicting changes from update-install-scripts-to-check-for-python vs main
|
||||||
$env:Path = [System.Environment]::GetEnvironmentVariable('Path','Machine') + ';' +
|
$env:Path = [System.Environment]::GetEnvironmentVariable('Path','Machine') + ';' +
|
||||||
[System.Environment]::GetEnvironmentVariable('Path','User')
|
[System.Environment]::GetEnvironmentVariable('Path','User')
|
||||||
$PythonCmd = Get-PythonCommand
|
$PythonCmd = Get-PythonCommand
|
||||||
|
Reference in New Issue
Block a user