Merge branch 'develop' into bootstrap-gentoo

This commit is contained in:
Ivo Jansky 2020-09-27 11:43:49 +02:00
commit ea7fa19c77
No known key found for this signature in database
GPG key ID: 4ADCFB992CA57189
2 changed files with 22 additions and 1 deletions

View file

@ -227,6 +227,27 @@ Installing the latest master branch of Salt:
curl -L https://bootstrap.saltstack.com | sudo sh -s -- git master
Install on Windows
~~~~~~~~~~~~~~~~~~
Using ``PowerShell`` to install latest stable version:
.. code:: console
Invoke-WebRequest -Uri https://winbootstrap.saltstack.com -OutFile C:\Temp\bootstrap-salt.ps1
Set-ExecutionPolicy -ExecutionPolicy Unrestricted -Scope CurrentUser
C:\Temp\bootstrap-salt.ps1
Set-ExecutionPolicy -ExecutionPolicy Undefined -Scope CurrentUser
Using ``cygwin`` to install latest stable version:
.. code:: console
curl -o bootstrap-salt.ps1 -L https://winbootstrap.saltstack.com
"/cygdrive/c/WINDOWS/System32/WindowsPowerShell/v1.0/powershell.exe" -NoProfile -InputFormat None -ExecutionPolicy Bypass -Command "[System.Net.ServicePointManager]::SecurityProtocol = 3072; iex ./bootstrap-salt.ps1"
Supported Operating Systems
---------------------------

View file

@ -85,7 +85,7 @@ Param(
[Parameter(Mandatory=$false,ValueFromPipeline=$true)]
# Doesn't support Python versions prior to "2017.7.0"
[ValidateSet("2","3")]
[string]$pythonVersion = "2",
[string]$pythonVersion = "3",
[Parameter(Mandatory=$false,ValueFromPipeline=$true)]
[ValidateSet("true","false")]