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

Add support for new version scheme

Browse source
This commit is contained in:
twangboy 2020-02-13 17:07:17 -07:00
parent b029e4ce5c
commit de3dd0123e
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
bootstrap-salt.ps1
View file

@ -77,11 +77,13 @@
Param( Param(
[Parameter(Mandatory=$false,ValueFromPipeline=$true)] [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
# Doesn't support versions prior to "YYYY.M.R-B" # Doesn't support versions prior to "YYYY.M.R-B"
[ValidatePattern('^201\d\.\d{1,2}\.\d{1,2}(\-\d{1})?|(rc\d)$')] # Supports new version and latest
# Option 1 means case insensitive
[ValidatePattern('^(\d{4}(\.\d{1,2}){0,2}(\-\d{1})?)|(latest)$', Options=1)]
[string]$version = '', [string]$version = '',
[Parameter(Mandatory=$false,ValueFromPipeline=$true)] [Parameter(Mandatory=$false,ValueFromPipeline=$true)]
# Doesn't support versions prior to "2017.7.0" # Doesn't support Python versions prior to "2017.7.0"
[ValidateSet("2","3")] [ValidateSet("2","3")]
[string]$pythonVersion = "2", [string]$pythonVersion = "2",
@ -99,8 +101,8 @@ Param(
[string]$repourl= "https://repo.saltstack.com/windows" [string]$repourl= "https://repo.saltstack.com/windows"
) )
# Powershell supports only TLS 1.0 by default. Add support up to TLS 1.2 # Powershell supports only TLS 1.0 by default. Add support for TLS 1.2
[System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls,Tls11,Tls12' [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.SecurityProtocolType]'Tls12'
#=============================================================================== #===============================================================================
# Script Functions # Script Functions
@ -213,7 +215,7 @@ Else {
#=============================================================================== #===============================================================================
# Use version "Latest" if no version is passed # Use version "Latest" if no version is passed
#=============================================================================== #===============================================================================
If (!$version) { If ((!$version) -or ($version.ToLower() -eq 'latest')){
$versionSection = "Latest-Py$pythonVersion" $versionSection = "Latest-Py$pythonVersion"
} else { } else {
$versionSection = $version $versionSection = $version