aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2005-08-26 00:59:07 +0000
committerUlf Lamping <ulf.lamping@web.de>2005-08-26 00:59:07 +0000
commitbff42b2decb712fa2d3469e384d1dc325cf0e687 (patch)
tree4a969ef683c678947a6b0054cfcae2c575abab1c /packaging
parent8615ff5f8010b62c41f9a2d6dc66381e643501ff (diff)
fix #339: don't try to install WinPcap with a silent installer
svn path=/trunk/; revision=15536
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/ethereal.nsi6
1 files changed, 5 insertions, 1 deletions
diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi
index 998a00d589..5f11982734 100644
--- a/packaging/nsis/ethereal.nsi
+++ b/packaging/nsis/ethereal.nsi
@@ -525,6 +525,9 @@ pop $R0
!insertmacro UpdateIcons
SecRequired_skip_FileExtensions:
+; if running as a silent installer, don't try to install winpcap
+IfSilent SecRequired_skip_Winpcap
+
; Install WinPcap (depending on winpcap page setting)
ReadINIStr $0 "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State"
StrCmp $0 "0" SecRequired_skip_Winpcap
@@ -1060,6 +1063,7 @@ lbl_select_wimp:
lbl_ignore_wimp:
!endif
+
; detect if WinPcap should be installed
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 3.1"
ReadRegStr $WINPCAP_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName"
@@ -1083,7 +1087,7 @@ lbl_winpcap_installed:
StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta3" lbl_winpcap_do_install
StrCmp "$WINPCAP_VERSION" "WinPcap 3.1 beta4" lbl_winpcap_do_install
-; lbl_winpcap_dont_install:
+lbl_winpcap_dont_install:
; seems to be the current or even a newer version, so don't install
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "State" "0"
WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 5" "Text" "If selected, the currently installed $WINPCAP_VERSION will be uninstalled first."