saltstack/salt-bootstrap
1
0
Fork 0
mirror of https://github.com/saltstack/salt-bootstrap.git synced 2025-04-17 10:10:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from twangboy/fix_bootstrap

Browse source 
Fix version detection, versionSection creation
This commit is contained in:
Nicole Thomas 2017-08-08 12:31:02 -04:00 • committed by GitHub
commit aa887bfa97
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bootstrap-salt.ps1
View file

@ -228,19 +228,20 @@ If (!$version) {
$returnMatches = $returnMatches | Where {$_ -like "Salt-Minion*AMD64-Setup.exe"}
}
$version = $($returnMatches[$returnMatches.Count -1]).Split(("n-","-A","-x"),([System.StringSplitOptions]::RemoveEmptyEntries))[1]
$version = $($returnMatches[$returnMatches.Count -1]).Split(("n-","-A","-x","-P"),([System.StringSplitOptions]::RemoveEmptyEntries))[1]
}
$year = $version.Substring(0, 3)
$versionSection = $version
$year = $version.Substring(0, 4)
If ([int]$year -ge 2017) {
If ($pythonVersion -eq "3") {
$pythonVersion = "-Py3"
$versionSection = "$version-Py3"
}
Else {
$pythonVersion = "-Py2"
$versionSection = "$version-Py2"
}
}
$versionSection = $version + $pythonVersion
#===============================================================================
# Download minion setup file