PenTest/nmap
1
0
Fork 0
mirror of https://github.com/nmap/nmap.git synced 2025-12-07 05:01:29 +00:00
Code Issues Projects Releases Wiki Activity

Simplify some IfSilent calls (MessageBox is not displayed in silent mode anyway)

Browse Source
This commit is contained in:
dmiller
2019-06-19 19:42:28 +00:00
parent 4897d3c802
commit c752223c7b
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mswin32/nsis/Nmap.nsi.in
View File

@@ -363,10 +363,8 @@ Function vcredist2013installer
vcredist_not_present: vcredist_not_present:
DetailPrint "Microsoft Visual C++ 2013 Redistributable failed to install" DetailPrint "Microsoft Visual C++ 2013 Redistributable failed to install"
IfSilent vcredist_done vcredist_messagebox MessageBox MB_OK "Microsoft Visual C++ 2013 Redistributable Package (x86) failed to install. Please ensure your system meets the minimum requirements before running the installer again."
vcredist_messagebox: Goto vcredist_done
MessageBox MB_OK "Microsoft Visual C++ 2013 Redistributable Package (x86) failed to install. Please ensure your system meets the minimum requirements before running the installer again."
Goto vcredist_done
vcredist_success: vcredist_success:
Delete "$PLUGINSDIR\vcredist_x86.exe" Delete "$PLUGINSDIR\vcredist_x86.exe"
DetailPrint "Microsoft Visual C++ 2013 Redistributable was successfully installed" DetailPrint "Microsoft Visual C++ 2013 Redistributable was successfully installed"
@@ -399,10 +397,8 @@ Function vcredist2008installer
StrCmp $0 "Microsoft Visual C++ 2008 Redistributable - x86 9.0.30729.6161" vcredist2008_success vcredist2008_not_present StrCmp $0 "Microsoft Visual C++ 2008 Redistributable - x86 9.0.30729.6161" vcredist2008_success vcredist2008_not_present
vcredist2008_not_present: vcredist2008_not_present:
DetailPrint "Microsoft Visual C++ 2008 Redistributable failed to install" DetailPrint "Microsoft Visual C++ 2008 Redistributable failed to install"
IfSilent vcredist2008_done vcredist2008_messagebox MessageBox MB_OK "Microsoft Visual C++ 2008 Redistributable Package (x86) failed to install. Please ensure your system meets the minimum requirements before running the installer again."
vcredist2008_messagebox: Goto vcredist2008_done
MessageBox MB_OK "Microsoft Visual C++ 2008 Redistributable Package (x86) failed to install. Please ensure your system meets the minimum requirements before running the installer again."
Goto vcredist2008_done
vcredist2008_success: vcredist2008_success:
Delete "$PLUGINSDIR\vcredist2008_x86.exe" Delete "$PLUGINSDIR\vcredist2008_x86.exe"
DetailPrint "Microsoft Visual C++ 2008 Redistributable was successfully installed" DetailPrint "Microsoft Visual C++ 2008 Redistributable was successfully installed"