root/GPXSee
1
0
Fork 0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 03:35:53 +01:00
Code Issues Projects Releases Activity

Always run the redistributables installer and let it decide what to do

Browse Source 
(instead of an own and broken registry check with magic numbers)
This commit is contained in:
Martin Tůma 2020-01-26 15:58:20 +01:00
parent eef6360643
commit cb03c8a903
2 changed files with 11 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkg/gpxsee.nsi
View File

@ -148,22 +148,11 @@ Section "MSVC runtime" SEC_MSVC
SectionIn RO
DetailPrint "Checking whether Visual C++ 2017 runtime is already installed..."
${If} ${RunningX64}
ReadRegStr $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Version"
${Else}
ReadRegStr $R0 HKLM "SOFTWARE\Microsoft\VisualStudio\14.0\VC\Runtimes\x86" "Version"
${EndIf}
SetOutPath $TEMP
File "vc_redist.x86.exe"
ExecWait '"$TEMP\vc_redist.x86.exe" /install /quiet /norestart'
SetOutPath $INSTDIR
${If} $R0 >= "v14.24.28127.04"
DetailPrint "Visual C++ 2017 runtime is already installed, skipping install."
${Else}
DetailPrint "Installing Visual C++ 2017 Redistributable..."
SetOutPath $TEMP
File "vc_redist.x86.exe"
ExecWait '"$TEMP\vc_redist.x86.exe" /install /quiet /norestart'
SetOutPath $INSTDIR
${EndIf}
SectionEnd
Section "OpenSSL" SEC_OPENSSL
@ -262,4 +251,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
!insertmacro MUI_FUNCTION_DESCRIPTION_END

18
pkg/gpxsee64.nsi
View File

@ -155,17 +155,11 @@ Section "MSVC runtime" SEC_MSVC
SectionIn RO
DetailPrint "Checking whether Visual C++ 2017 runtime is already installed..."
ReadRegStr $R0 HKLM "SOFTWARE\Wow6432Node\Microsoft\VisualStudio\14.0\VC\Runtimes\x64" "Version"
${If} $R0 >= "v14.24.28127.04"
DetailPrint "Visual C++ 2017 runtime is already installed, skipping install."
${Else}
DetailPrint "Installing Visual C++ 2017 runtime..."
SetOutPath $TEMP
File "vc_redist.x64.exe"
ExecWait '"$TEMP\vc_redist.x64.exe" /install /quiet /norestart'
SetOutPath $INSTDIR
${EndIf}
SetOutPath $TEMP
File "vc_redist.x64.exe"
ExecWait '"$TEMP\vc_redist.x64.exe" /install /quiet /norestart'
SetOutPath $INSTDIR
SectionEnd
Section "OpenSSL" SEC_OPENSSL
@ -265,4 +259,4 @@ LangString DESC_LOCALIZATION ${LANG_ENGLISH} \
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_MSVC} $(DESC_MSVC)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_APP} $(DESC_APP)
!insertmacro MUI_DESCRIPTION_TEXT ${SEC_LOCALIZATION} $(DESC_LOCALIZATION)
!insertmacro MUI_FUNCTION_DESCRIPTION_END
!insertmacro MUI_FUNCTION_DESCRIPTION_END