cli: nsis: Fix copy-paste error.

[sigrok-cli.git] / contrib / sigrok-cli.nsi.in

diff --git a/contrib/sigrok-cli.nsi.in b/contrib/sigrok-cli.nsi.in
index 2b375f5e5fa934299b3a2c8b4464bfa8900599cf..55868a2c6298791932a79cb794bad6415ef16cf9 100644 (file)
--- a/contrib/sigrok-cli.nsi.in
+++ b/contrib/sigrok-cli.nsi.in
@@ -132,6 +132,10 @@ Section "@PACKAGE_NAME@ (required)" Section1
        File "c:\MinGW\bin\libiconv-2.dll"
        File "c:\MinGW\bin\libstdc++-6.dll"
 
+       # MSYS libs.
+       File "c:\MinGW\msys\1.0\bin\msys-1.0.dll"
+       File "c:\MinGW\msys\1.0\bin\msys-z.dll"
+
        # External libs
        File "c:\MinGW\msys\1.0\local\bin\libglib-2.0-0.dll"
        File "c:\MinGW\msys\1.0\local\bin\libgthread-2.0-0.dll"
@@ -155,13 +159,23 @@ Section "@PACKAGE_NAME@ (required)" Section1
        CreateDirectory "$SMPROGRAMS\sigrok"
        CreateDirectory "$SMPROGRAMS\sigrok\@PACKAGE_NAME@"
 
-       # TODO: Create a shortcut for sigrok-cli (DOS box? README only?).
+       # Create a shortcut for sigrok-cli (this merely opens a "DOS box").
+       # Set the working directory (where the user will be placed into when
+       # the DOS box starts) to the user's Desktop directory.
+       SetOutPath "$DESKTOP"
+       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\sigrok command-line tool.lnk" \
+               "$SYSDIR\cmd.exe" \
+               "/K echo For instructions run sigrok-cli --help." \
+               "$SYSDIR\cmd.exe" 0 \
+               SW_SHOWNORMAL "" "Run @PACKAGE_NAME@"
 
        # Create a shortcut for the uninstaller.
        CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Uninstall.lnk" \
                "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 \
                SW_SHOWNORMAL "" "Uninstall @PACKAGE_NAME@"
 
+       # TODO: Add sigrok-cli directory to the PATH env. variable.
+
 SectionEnd
 
 
@@ -199,6 +213,8 @@ Section "Uninstall"
        Delete "$INSTDIR\intl.dll"
        Delete "$INSTDIR\libiconv-2.dll"
        Delete "$INSTDIR\libstdc++-6.dll"
+       Delete "$INSTDIR\msys-1.0.dll"
+       Delete "$INSTDIR\msys-z.dll"
        Delete "$INSTDIR\libglib-2.0-0.dll"
        Delete "$INSTDIR\libgthread-2.0-0.dll"
        Delete "$INSTDIR\libusb-1.0.dll"
@@ -216,6 +232,7 @@ Section "Uninstall"
        RMDir "$INSTDIR"
 
        # Delete the links from the start menu.
+       Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\sigrok command-line tool.lnk"
        Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Uninstall.lnk"
 
        # Delete the sub-directory in the start menu.