diff options
author | Gerald Combs <gerald@wireshark.org> | 2005-07-26 16:44:57 +0000 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2005-07-26 16:44:57 +0000 |
commit | a64a4043c3bfbde4f22782253d3ab5a64e416f98 (patch) | |
tree | 194d587b459d7fef4b6e41adfb1a2524baadaa04 /packaging/nsis/ethereal.nsi | |
parent | 90a1127ba1dd893fbd4ea07f55c69d7e0aa372b6 (diff) |
Revert back to GTK-Wimp 0.6.2. Move to WinPcap 3.1beta4.
svn path=/trunk/; revision=15091
Diffstat (limited to 'packaging/nsis/ethereal.nsi')
-rw-r--r-- | packaging/nsis/ethereal.nsi | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi index e1d1e32ac3..04f4c60eef 100644 --- a/packaging/nsis/ethereal.nsi +++ b/packaging/nsis/ethereal.nsi @@ -535,8 +535,8 @@ ExecWait '$WINPCAP_UNINSTALL' $0 DetailPrint "WinPcap uninstaller returned $0" lbl_winpcap_notinstalled: SetOutPath $INSTDIR -File "WinPcap_3_0.exe" -ExecWait '"$INSTDIR\WinPcap_3_0.exe"' $0 +File "WinPcap_3_1_beta4.exe" +ExecWait '"$INSTDIR\WinPcap_3_1_beta4.exe"' $0 DetailPrint "WinPcap installer returned $0" SecRequired_skip_Winpcap: @@ -1060,7 +1060,7 @@ lbl_ignore_wimp: !endif ; detect if WinPcap should be installed - WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 3.0" + WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 4" "Text" "Install WinPcap 3.1 beta 4" ReadRegStr $WINPCAP_VERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\WinPcapInst" "DisplayName" IfErrors 0 lbl_winpcap_installed ;if RegKey is available, WinPcap is already installed WriteINIStr "$PLUGINSDIR\WinPcapPage.ini" "Field 2" "Text" "WinPcap is currently not installed" |