Hopefully this is the best I can do.

master
Zed A. Shaw 3 months ago
parent 53fba91e24
commit 1ef9a4ad98
  1. 10
      base.ps1

@ -222,11 +222,11 @@ if(-not $isAdmin) {
$installs=@( $installs=@(
'Geany.Geany', 'Geany.Geany',
'Git.Git' 'Git.Git',
'Genivia.ugrep', 'Genivia.ugrep',
'Microsoft.WindowsTerminal', 'Microsoft.WindowsTerminal',
'Kitware.CMake', 'Kitware.CMake',
'Microsoft.VCRedist.2015+.x64', 'Microsoft.VCRedist.2015+.x64'
) )
Write-Warning "About to install the following software:" Write-Warning "About to install the following software:"
@ -270,7 +270,7 @@ if($env:PATH.contains($winlibsPath)) {
Write-Warning "!! to manually remove this part of your path if you want to change it." Write-Warning "!! to manually remove this part of your path if you want to change it."
Write-Warning "!! But, it will probably still work since that's where I installed it." Write-Warning "!! But, it will probably still work since that's where I installed it."
} else { } else {
$newPath = $Env:PATH + ";$winlibsPath\mingw64\bin" $newPath = $env:PATH + ";$winlibsPath\mingw64\bin"
[Environment]::SetEnvironmentVariable("Path", $newPath, "User") [Environment]::SetEnvironmentVariable("Path", $newPath, "User")
} }
@ -280,14 +280,14 @@ if($env:PATH.contains($gitPath)) {
Write-Warning "!! Looks like your git installed correctly, but if it fails to run then uninstall it with 'winget remove git.git' then install it again with 'winget install git.git'" Write-Warning "!! Looks like your git installed correctly, but if it fails to run then uninstall it with 'winget remove git.git' then install it again with 'winget install git.git'"
} else { } else {
Write-Warning "!! Git.Git did not add itself to the Path. The directory $gitPath is missing so I'll add it now." Write-Warning "!! Git.Git did not add itself to the Path. The directory $gitPath is missing so I'll add it now."
$newPath = $Env:PATH + ";$gitPath" $newPath = $env:PATH + ";$gitPath"
[Environment]::SetEnvironmentVariable("Path", $newPath, "User") [Environment]::SetEnvironmentVariable("Path", $newPath, "User")
if($env:PATH.contains($gitPath)) { if($env:PATH.contains($gitPath)) {
Write-Warning "?? Great, git is in the path so if it is gone after this then something is going on." Write-Warning "?? Great, git is in the path so if it is gone after this then something is going on."
} else { } else {
Write-Warning "!!!!!!!!!!!!!!!!!!!!! Despite manually forcing the git $gitPath into the path it is _still_ not there." Write-Warning "!!!!!!!!!!!!!!!!!!!!! Despite manually forcing the git $gitPath into the path it is _still_ not there."
Write-Warning "You'll have to manually install it later with: winget install git.git." Write-Warning "You'll have to manually install git later with: winget install git.git."
winget remove git.git winget remove git.git
} }
} }

Loading…
Cancel
Save