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

Update python to 2.7.15 and 3.5.4 for Windows installers

Browse source
This commit is contained in:
twangboy 2019-01-09 16:08:57 -07:00
parent 2b22006909
commit 9992eb40c1
No known key found for this signature in database
GPG key ID: 93FF3BDEB278C9EB
2 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkg/windows/clean_env.bat
View file

@ -37,6 +37,10 @@ goto CheckPython3
MsiExec.exe /X {0398A685-FD8D-46B3-9816-C47319B0CF5E} /QN
echo %0 :: - 2.7.14 (64 bit)
MsiExec.exe /X {0398A685-FD8D-46B3-9816-C47319B0CF5F} /QN
echo %0 :: - 2.7.15 (32 bit)
MsiExec.exe /X {16CD92A4-0152-4CB7-8FD6-9788D3363616} /QN
echo %0 :: - 2.7.15 (64 bit)
MsiExec.exe /X {16CD92A4-0152-4CB7-8FD6-9788D3363617} /QN
echo.
@ -63,12 +67,20 @@ goto eof
echo %0 :: - 3.5.3 64bit
"%LOCALAPPDATA%\Package Cache\{b94f45d6-8461-440c-aa4d-bf197b2c2499}\python-3.5.3-amd64.exe" /uninstall /quiet
)
if exist "%LOCALAPPDATA%\Package Cache\{5d57524f-af24-49a7-b90b-92138880481e}" (
echo %0 :: - 3.5.4 64bit
"%LOCALAPPDATA%\Package Cache\{5d57524f-af24-49a7-b90b-92138880481e}\python-3.5.4-amd64.exe" /uninstall /quiet
)
:: 32 bit
if exist "%LOCALAPPDATA%\Package Cache\{a10037e1-4247-47c9-935b-c5ca049d0299}" (
echo %0 :: - 3.5.3 32bit
"%LOCALAPPDATA%\Package Cache\{a10037e1-4247-47c9-935b-c5ca049d0299}\python-3.5.3" /uninstall /quiet
)
if exist "%LOCALAPPDATA%\Package Cache\{06e841fa-ca3b-4886-a820-cd32c614b0c1}" (
echo %0 :: - 3.5.4 32bit
"%LOCALAPPDATA%\Package Cache\{06e841fa-ca3b-4886-a820-cd32c614b0c1}\python-3.5.4" /uninstall /quiet
)
rem wipe the Python directory
echo %0 :: Removing the C:\Python35 Directory ...

8
pkg/windows/modules/get-settings.psm1
View file

@ -54,15 +54,15 @@ Function Get-Settings {
# Filenames for 64 bit Windows
$64bitPrograms = @{
"Python2" = "python-2.7.14.amd64.msi"
"Python3" = "python-3.5.3-amd64.exe"
"Python2" = "python-2.7.15.amd64.msi"
"Python3" = "python-3.5.4-amd64.exe"
}
$ini.Add("64bitPrograms", $64bitPrograms)
# Filenames for 32 bit Windows
$32bitPrograms = @{
"Python2" = "python-2.7.14.msi"
"Python3" = "python-3.5.3.exe"
"Python2" = "python-2.7.15.msi"
"Python3" = "python-3.5.4.exe"
}
$ini.Add("32bitPrograms", $32bitPrograms)