aboutsummaryrefslogtreecommitdiffstats
path: root/packaging
diff options
context:
space:
mode:
authorUlf Lamping <ulf.lamping@web.de>2005-09-14 02:07:20 +0000
committerUlf Lamping <ulf.lamping@web.de>2005-09-14 02:07:20 +0000
commita7e184cb593d57f9a92f28b8977de79ced85f517 (patch)
tree5bdcdb7e9517cfaaafee6a6bb6715a29ed0a6e92 /packaging
parent7900675ab5507f904f794f120aee0e8909502792 (diff)
fix #388: add /desktopicon and /quicklaunchicon command line options to the NSIS installer
update the User's Guide accordingly svn path=/trunk/; revision=15792
Diffstat (limited to 'packaging')
-rw-r--r--packaging/nsis/ethereal.nsi25
1 files changed, 23 insertions, 2 deletions
diff --git a/packaging/nsis/ethereal.nsi b/packaging/nsis/ethereal.nsi
index fafde0787a..e2aec9188d 100644
--- a/packaging/nsis/ethereal.nsi
+++ b/packaging/nsis/ethereal.nsi
@@ -163,6 +163,14 @@ Page custom DisplayWinPcapPage
!include "servicelib.nsh"
; ============================================================================
+; Command Line
+; ============================================================================
+!include "FileFunc.nsh"
+
+!insertmacro GetParameters
+!insertmacro GetOptions
+
+; ============================================================================
; License page configuration
; ============================================================================
LicenseText "Ethereal is distributed under the GNU General Public License."
@@ -462,16 +470,29 @@ CreateShortCut "$SMPROGRAMS\Ethereal\Ethereal Program Directory.lnk" \
;CreateShortCut "$SMPROGRAMS\Ethereal\Uninstall Ethereal.lnk" "$INSTDIR\uninstall.exe"
SecRequired_skip_StartMenu:
+; is command line option "/desktopicon" set?
+${GetParameters} $R0
+${GetOptions} $R0 "/desktopicon=" $R1
+StrCmp $R1 "no" SecRequired_skip_DesktopIcon
+StrCmp $R1 "yes" SecRequired_install_DesktopIcon
-; Create desktop icon (depending on additional tasks page)
+; Create desktop icon (depending on additional tasks page and command line option)
ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 3" "State"
StrCmp $0 "0" SecRequired_skip_DesktopIcon
+SecRequired_install_DesktopIcon:
CreateShortCut "$DESKTOP\Ethereal.lnk" "$INSTDIR\ethereal.exe" "" "$INSTDIR\ethereal.exe" 0 "" "" "The Ethereal Network Protocol Analyzer"
SecRequired_skip_DesktopIcon:
-; Create quick launch icon (depending on additional tasks page)
+; is command line option "/quicklaunchicon" set?
+${GetParameters} $R0
+${GetOptions} $R0 "/quicklaunchicon=" $R1
+StrCmp $R1 "no" SecRequired_skip_QuickLaunchIcon
+StrCmp $R1 "yes" SecRequired_install_QuickLaunchIcon
+
+; Create quick launch icon (depending on additional tasks page and command line option)
ReadINIStr $0 "$PLUGINSDIR\AdditionalTasksPage.ini" "Field 4" "State"
StrCmp $0 "0" SecRequired_skip_QuickLaunchIcon
+SecRequired_install_QuickLaunchIcon:
CreateShortCut "$QUICKLAUNCH\Ethereal.lnk" "$INSTDIR\ethereal.exe" "" "$INSTDIR\ethereal.exe" 0 "" "" "The Ethereal Network Protocol Analyzer"
SecRequired_skip_QuickLaunchIcon: