mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Remove last vestiges of UCRT in Windows Installer
This commit is contained in:
parent
9269b5009b
commit
cda4823fd1
1 changed files with 0 additions and 68 deletions
|
@ -533,74 +533,6 @@ Section -copy_prereqs
|
|||
File /r "..\..\prereqs\"
|
||||
SectionEnd
|
||||
|
||||
# Check if the Windows 10 Universal C Runtime (KB2999226) is installed. Python
|
||||
# 3 needs the updated ucrt on Windows 8.1/2012R2 and lower. They are installed
|
||||
# via KB2999226, but we're not going to patch the system here. Instead, we're
|
||||
# going to copy the .dll files to the \salt\bin directory
|
||||
Section -install_ucrt
|
||||
|
||||
Var /GLOBAL UcrtFileName
|
||||
|
||||
# Get the Major.Minor version Number
|
||||
# Windows 10 introduced CurrentMajorVersionNumber
|
||||
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\Windows NT\CurrentVersion" \
|
||||
CurrentMajorVersionNumber
|
||||
|
||||
# Windows 10/2016 will return a value here, skip to the end if returned
|
||||
StrCmp $R0 '' lbl_needs_ucrt 0
|
||||
|
||||
# Found Windows 10
|
||||
detailPrint "KB2999226 does not apply to this machine"
|
||||
goto lbl_done
|
||||
|
||||
lbl_needs_ucrt:
|
||||
# UCRT only needed on Windows Server 2012R2/Windows 8.1 and below. The
|
||||
# first ReadRegStr command above should have skipped to lbl_done if on
|
||||
# Windows 10 box
|
||||
|
||||
# Is the update already installed
|
||||
ClearErrors
|
||||
|
||||
# Use WMI to check if it's installed
|
||||
detailPrint "Checking for existing UCRT (KB2999226) installation"
|
||||
nsExec::ExecToStack 'cmd /q /c wmic qfe get hotfixid | findstr "^KB2999226"'
|
||||
# Clean up the stack
|
||||
Pop $R0 # Gets the ErrorCode
|
||||
Pop $R1 # Gets the stdout, which should be KB2999226 if it's installed
|
||||
|
||||
# If it returned KB2999226 it's already installed
|
||||
StrCmp $R1 'KB2999226' lbl_done
|
||||
|
||||
detailPrint "UCRT (KB2999226) not found"
|
||||
|
||||
# Use RunningX64 here to get the Architecture for the system running the
|
||||
# installer.
|
||||
${If} ${RunningX64}
|
||||
StrCpy $UcrtFileName "ucrt_x64.zip"
|
||||
${Else}
|
||||
StrCpy $UcrtFileName "ucrt_x86.zip"
|
||||
${EndIf}
|
||||
|
||||
ClearErrors
|
||||
|
||||
detailPrint "Unzipping UCRT dll files to $INSTDIR\Scripts"
|
||||
CreateDirectory $INSTDIR\Scripts
|
||||
nsisunz::UnzipToLog "$PLUGINSDIR\$UcrtFileName" "$INSTDIR\Scripts"
|
||||
|
||||
# Clean up the stack
|
||||
Pop $R0 # Get Error
|
||||
|
||||
${IfNot} $R0 == "success"
|
||||
detailPrint "error: $R0"
|
||||
Sleep 3000
|
||||
${Else}
|
||||
detailPrint "UCRT dll files copied successfully"
|
||||
${EndIf}
|
||||
|
||||
lbl_done:
|
||||
|
||||
SectionEnd
|
||||
|
||||
|
||||
# Check and install Visual C++ redist 2022 packages
|
||||
# Hidden section (-) to install VCRedist
|
||||
|
|
Loading…
Add table
Reference in a new issue