mirror of
https://github.com/nmap/nmap.git
synced 2026-01-28 17:19:05 +00:00
Remove nmap-update
This feature was never publicly released, and has not been distributed in our binary builds for a couple versions now. It needed to be removed in order to reduce the number of places Nmap looks for data files. See #2051
This commit is contained in:
@@ -11,7 +11,6 @@
|
||||
;; /NCAT=NO don't install Ncat
|
||||
;; /NDIFF=NO don't install Ndiff
|
||||
;; /NPING=NO don't install Nping
|
||||
;; /NMAPUPDATE=NO don't install nmap-update
|
||||
;; /D=C:\dir\... install to C:\dir\... (overrides InstallDir)
|
||||
;;
|
||||
;;/D is a built-in NSIS option and has these restrictions:
|
||||
@@ -333,14 +332,6 @@ Section "Nping (Packet generator)" SecNping
|
||||
Call create_uninstaller
|
||||
SectionEnd
|
||||
|
||||
#Section "nmap-update (updater for architecture-independent files)" SecNmapUpdate
|
||||
# SetOutPath "$INSTDIR"
|
||||
# SetOverwrite on
|
||||
# File ${STAGE_DIR}\nmap-update.exe
|
||||
# Call vcredist2013installer
|
||||
# Call create_uninstaller
|
||||
#SectionEnd
|
||||
#
|
||||
Function vcredist2013installer
|
||||
StrCmp $vcredist2013set "" 0 vcredist_done
|
||||
StrCpy $vcredist2013set "true"
|
||||
@@ -478,7 +469,6 @@ Function .onInit
|
||||
!insertmacro OptionDisableSection $0 "/NCAT=" ${SecNcat}
|
||||
!insertmacro OptionDisableSection $0 "/NDIFF=" ${SecNdiff}
|
||||
!insertmacro OptionDisableSection $0 "/NPING=" ${SecNping}
|
||||
#!insertmacro OptionDisableSection $0 "/NMAPUPDATE=" ${SecNmapUpdate}
|
||||
FunctionEnd
|
||||
|
||||
;--------------------------------
|
||||
@@ -493,7 +483,6 @@ FunctionEnd
|
||||
LangString DESC_SecNcat ${LANG_ENGLISH} "Installs Ncat, Nmap's Netcat replacement."
|
||||
LangString DESC_SecNdiff ${LANG_ENGLISH} "Installs Ndiff, a tool for comparing Nmap XML files."
|
||||
LangString DESC_SecNping ${LANG_ENGLISH} "Installs Nping, a packet generation tool."
|
||||
#LangString DESC_SecNmapUpdate ${LANG_ENGLISH} "Installs nmap-update, an updater for architecture-independent files."
|
||||
|
||||
;Assign language strings to sections
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN
|
||||
@@ -505,7 +494,6 @@ FunctionEnd
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecNcat} $(DESC_SecNcat)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecNdiff} $(DESC_SecNdiff)
|
||||
!insertmacro MUI_DESCRIPTION_TEXT ${SecNping} $(DESC_SecNping)
|
||||
#!insertmacro MUI_DESCRIPTION_TEXT ${SecNmapUpdate} $(DESC_SecNmapUpdate)
|
||||
!insertmacro MUI_FUNCTION_DESCRIPTION_END
|
||||
;--------------------------------
|
||||
;Uninstaller Section
|
||||
@@ -539,7 +527,6 @@ Section "Uninstall"
|
||||
IfFileExists $INSTDIR\ncat.exe nmap_installed
|
||||
IfFileExists $INSTDIR\nping.exe nmap_installed
|
||||
IfFileExists $INSTDIR\ndiff.exe nmap_installed
|
||||
#IfFileExists $INSTDIR\nmap-update.exe nmap_installed
|
||||
MessageBox MB_YESNO "It does not appear that ${NMAP_NAME} is installed in the directory '$INSTDIR'.$\r$\nContinue anyway (not recommended)?" IDYES nmap_installed
|
||||
Abort "Uninstall aborted by user"
|
||||
|
||||
@@ -577,7 +564,6 @@ Section "Uninstall"
|
||||
Delete "$INSTDIR\COPYING_HIGWIDGETS"
|
||||
Delete "$INSTDIR\ncat.exe"
|
||||
Delete "$INSTDIR\nping.exe"
|
||||
#Delete "$INSTDIR\nmap-update.exe"
|
||||
Delete "$INSTDIR\ca-bundle.crt"
|
||||
;Delete specific subfolders (NB: custom scripts in scripts folder will be lost)
|
||||
RMDir /r "$INSTDIR\nselib"
|
||||
|
||||
Reference in New Issue
Block a user