mirror of
https://github.com/nmap/nmap.git
synced 2025-12-07 13:11:28 +00:00
Fixed a "minor" problem with our WinPcap installer (instead of running our uninstaller if our InstalledBy string was present, it would run "Nmap /S _?=$INSTDIR"), which caused Nmap to briefly display its help output if it was in the same directory (or presumably in the system/user's PATH).
This commit is contained in:
@@ -207,8 +207,10 @@ Function .onInit
|
|||||||
return
|
return
|
||||||
|
|
||||||
silent_uninstall:
|
silent_uninstall:
|
||||||
; Our old UninstallString is present, should have quotes and uninstall.exe location
|
; Our InstalledBy string is present, UninstallString should have quotes and uninstall.exe location
|
||||||
; and should support a silent uninstall by passing /S to it.
|
; and this file should support a silent uninstall by passing /S to it.
|
||||||
|
; we could read QuietUninstallString, but this should be exactly the same as UninstallString with /S on the end.
|
||||||
|
ReadRegStr $0 "HKLM" "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "UninstallString"
|
||||||
ExecWait '$0 /S _?=$INSTDIR'
|
ExecWait '$0 /S _?=$INSTDIR'
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -27,15 +27,6 @@ o Investigate a probe/response matching problem reported by QA Cafe
|
|||||||
Matthew Stickey and Joe McEachern of QA Cafe. See this thread:
|
Matthew Stickey and Joe McEachern of QA Cafe. See this thread:
|
||||||
http://seclists.org/nmap-dev/2011/q3/227
|
http://seclists.org/nmap-dev/2011/q3/227
|
||||||
|
|
||||||
o When our winpcap installer is run in silent mode
|
|
||||||
(e.g. "winpcap-nmap-4.12.exe /S"), it seems to execute nmap.exe if
|
|
||||||
that binary exists in the same directory. This leads to a cmd.exe
|
|
||||||
window briefly poping up as Nmap displays its console help output.
|
|
||||||
Moving the Winpcap installer into its own subdir and running it from
|
|
||||||
there seems to fix this (because it then can't find nmap.exe to
|
|
||||||
run), but it would be better to determine why this is happening in
|
|
||||||
the first place and fix it.
|
|
||||||
|
|
||||||
==Things needed for next STABLE release go ABOVE THIS LINE==
|
==Things needed for next STABLE release go ABOVE THIS LINE==
|
||||||
|
|
||||||
o We should document Ron's sample script
|
o We should document Ron's sample script
|
||||||
|
|||||||
Reference in New Issue
Block a user