From 2558c9048854a2b128a9f683dfcc54be64190228 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 20 May 2023 22:11:20 +0000
Subject: [PATCH] Allow silent installer to create desktop shortcuts

---
 mswin32/nsis/Nmap.nsi | 61 ++++++++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 27 deletions(-)

diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index 259bc2319..0f6304626 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -298,6 +298,10 @@ Section "Zenmap (GUI Frontend)" SecZenmap
   WriteINIStr "$INSTDIR\zenmap\share\zenmap\config\zenmap.conf" paths ndiff_command_path "$INSTDIR\ndiff.bat"
   !insertmacro writeZenmapShortcut "$INSTDIR\Zenmap.lnk"
   StrCpy $zenmapset "true"
+  ${If} ${Silent}
+    File "/oname=$PLUGINSDIR\shortcuts.ini" "shortcuts.ini"
+    Call makeShortcuts
+  ${EndIf}
   Call create_uninstaller
 SectionEnd
 
@@ -337,33 +341,6 @@ SectionEnd
 # add dummy parameters for our test
 !define VCRedistInstalled `"" VCRedistInstalled ""`
 
-Function vcredistinstaller
-  ${If} $vcredistset != ""
-    Return
-  ${EndIf}
-  StrCpy $vcredistset "true"
-  ;Check if VC++ runtimes are already installed.
-  ;This version creates a registry key that makes it easy to check whether a version (not necessarily the
-  ;one we may be about to install) of the VC++ redistributables have been installed.
-  ;Only run our installer if a version isn't already present, to prevent installing older versions resulting in error messages.
-  ;If VC++ runtimes are not installed...
-  ${IfNot} ${VCRedistInstalled}
-    DetailPrint "Installing Microsoft Visual C++ ${VCREDISTYEAR} Redistributable"
-    SetOutPath $PLUGINSDIR
-    File ..\${VCREDISTEXE}
-    ExecWait '"$PLUGINSDIR\${VCREDISTEXE}" /quiet' $0
-    ;Check for successful installation of our package...
-    Delete "$PLUGINSDIR\${VCREDISTEXE}"
-
-    ${IfNot} ${VCRedistInstalled}
-      DetailPrint "Microsoft Visual C++ ${VCREDISTYEAR} Redistributable failed to install"
-      MessageBox MB_OK "Microsoft Visual C++ ${VCREDISTYEAR} Redistributable Package (${NMAP_ARCH}) failed to install. Please ensure your system meets the minimum requirements before running the installer again."
-    ${Else}
-      DetailPrint "Microsoft Visual C++ ${VCREDISTYEAR} Redistributable was successfully installed"
-    ${EndIf}
-  ${EndIf}
-FunctionEnd
-
 Function create_uninstaller
   StrCmp $addremoveset "" 0 skipaddremove
   ; Register Nmap with add/remove programs
@@ -476,6 +453,36 @@ FunctionEnd
     !insertmacro MUI_DESCRIPTION_TEXT ${SecNcat} $(DESC_SecNcat)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecNping} $(DESC_SecNping)
   !insertmacro MUI_FUNCTION_DESCRIPTION_END
+
+; Keep this at the end: vcredist is big and not needed in many cases, so we can
+; speed install up by not extracting it.
+Function vcredistinstaller
+  ${If} $vcredistset != ""
+    Return
+  ${EndIf}
+  StrCpy $vcredistset "true"
+  ;Check if VC++ runtimes are already installed.
+  ;This version creates a registry key that makes it easy to check whether a version (not necessarily the
+  ;one we may be about to install) of the VC++ redistributables have been installed.
+  ;Only run our installer if a version isn't already present, to prevent installing older versions resulting in error messages.
+  ;If VC++ runtimes are not installed...
+  ${IfNot} ${VCRedistInstalled}
+    DetailPrint "Installing Microsoft Visual C++ ${VCREDISTYEAR} Redistributable"
+    SetOutPath $PLUGINSDIR
+    File ..\${VCREDISTEXE}
+    ExecWait '"$PLUGINSDIR\${VCREDISTEXE}" /quiet' $0
+    ;Check for successful installation of our package...
+    Delete "$PLUGINSDIR\${VCREDISTEXE}"
+
+    ${IfNot} ${VCRedistInstalled}
+      DetailPrint "Microsoft Visual C++ ${VCREDISTYEAR} Redistributable failed to install"
+      MessageBox MB_OK "Microsoft Visual C++ ${VCREDISTYEAR} Redistributable Package (${NMAP_ARCH}) failed to install. Please ensure your system meets the minimum requirements before running the installer again."
+    ${Else}
+      DetailPrint "Microsoft Visual C++ ${VCREDISTYEAR} Redistributable was successfully installed"
+    ${EndIf}
+  ${EndIf}
+FunctionEnd
+
 ;--------------------------------
 ;Uninstaller Section