A few fixes

Actually default to Py2 like the docs say
Allow and actual version to be passed
Handle older versions
Write-Output when starting service
This commit is contained in:
twangboy 2019-11-25 13:28:52 -07:00
parent 15968cbdf6
commit 495464f6dd
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB

View file

@ -83,7 +83,7 @@ Param(
[Parameter(Mandatory=$false,ValueFromPipeline=$true)]
# Doesn't support versions prior to "2017.7.0"
[ValidateSet("2","3")]
[string]$pythonVersion = "",
[string]$pythonVersion = "2",
[Parameter(Mandatory=$false,ValueFromPipeline=$true)]
[ValidateSet("true","false")]
@ -214,19 +214,17 @@ Else {
# Use version "Latest" if no version is passed
#===============================================================================
If (!$version) {
$version = "Latest"
}
$versionSection = $version
$year = $version.Substring(0, 4)
If ([int]$year -ge 2017) {
$versionSection = "Latest-Py$pythonVersion"
} else {
$versionSection = $version
$year = $version.Substring(0, 4)
If ([int]$year -ge 2017) {
If ($pythonVersion -eq "3") {
$versionSection = "$version-Py3"
}
Else {
} Else {
$versionSection = "$version-Py2"
}
}
}
#===============================================================================
@ -270,6 +268,7 @@ While (!$service) {
If($runservice) {
# Start service
Write-Output "Starting the Salt minion service"
Start-Service -Name "salt-minion" -ErrorAction SilentlyContinue
# Check if service is started, otherwise retry starting the