fix #388: add /desktopicon and /quicklaunchicon command line options to the NSIS installer

update the User's Guide accordingly

svn path=/trunk/; revision=15792

2 files changed, 51 insertions, 6 deletions

diff --git a/docbook/eug_src/EUG_chapter_build_install.xml b/docbook/eug_src/EUG_chapter_build_install.xml
index 557b6350cb..91381c540d 100644
--- a/docbook/eug_src/EUG_chapter_build_install.xml
+++ b/docbook/eug_src/EUG_chapter_build_install.xml
@@ -483,24 +483,48 @@ apt-get install ethereal
 	<itemizedlist>
 	<listitem>
 		<para>
-		/NCRC disables the CRC check
+		<command>/NCRC</command> disables the CRC check
 		</para>
 	</listitem>
 	<listitem>
 		<para>
-		/S runs the installer or uninstaller silently with default values. 
-		Please note: The silent installer won't install WinPCap!
+		<command>/S</command> runs the installer or uninstaller silently with 
+		default values. Please note: The silent installer won't install WinPCap!
 		</para>
 	</listitem>
 	<listitem>
 		<para>
-		/D sets the default installation directory ($INSTDIR), overriding 
+		<command>/desktopicon</command> installation of the desktop icon, 
+		<command>=yes</command> - force installation, <command>=no</command> - 
+		don't install, otherwise use defaults / user settings.
+		This option is available since 0.10.13 an can be useful for a silent 
+		installer. 
+		</para>
+	</listitem>
+	<listitem>
+		<para>
+		<command>/quicklaunchicon</command> installation of the quick launch icon, 
+		<command>=yes</command> - force installation, <command>=no</command> - 
+		don't install, otherwise use defaults / user settings.
+		This option is available since 0.10.13 an can be useful for a silent 
+		installer. 
+		</para>
+	</listitem>
+	<listitem>
+		<para>
+		<command>/D</command> sets the default installation directory 
+		($INSTDIR), overriding 
 		InstallDir and InstallDirRegKey. It must be the last parameter used in 
 		the command line and must not contain any quotes, even if the path 
 		contains spaces.
 		</para>
 	</listitem>
 	</itemizedlist>
+	<para> Example:
+    <programlisting>
+ethereal-setup-0.10.13.exe /NCRC /S /desktopicon=yes /quicklaunchicon=no /D=C:\Program Files\Foo
+	</programlisting>
+	</para>
   </section>
   <section id="ChBuildInstallComponents">
     <title>Components</title>
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: