Installer: Whitespace consistency fixes.

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

diff --git a/contrib/sigrok-cli_cross.nsi.in b/contrib/sigrok-cli_cross.nsi.in
index ed4320950256148e76c5c609b769d275f7b97545..196a10740a599eed437c71484d23f801ca673118 100644 (file)
--- a/contrib/sigrok-cli_cross.nsi.in
+++ b/contrib/sigrok-cli_cross.nsi.in
@@ -110,7 +110,6 @@ RequestExecutionLevel admin
 # --- Default section ---------------------------------------------------------
 
 Section "@PACKAGE_NAME@ (required)" Section1
 # --- Default section ---------------------------------------------------------
 
 Section "@PACKAGE_NAME@ (required)" Section1

-

        # This section is gray (can't be disabled) in the component list.
        SectionIn RO
 
        # This section is gray (can't be disabled) in the component list.
        SectionIn RO
 


@@ -157,17 +156,17 @@ Section "@PACKAGE_NAME@ (required)" Section1
                SW_SHOWNORMAL "" "Run @PACKAGE_NAME@"
 
        # Create a shortcut for the uninstaller.
                SW_SHOWNORMAL "" "Run @PACKAGE_NAME@"
 
        # Create a shortcut for the uninstaller.

-       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Uninstall.lnk" \
+       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Uninstall @PACKAGE_NAME@.lnk" \

                "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 \
                SW_SHOWNORMAL "" "Uninstall @PACKAGE_NAME@"
 
        # Create a shortcut for the Zadig executable.
                "$INSTDIR\Uninstall.exe" "" "$INSTDIR\Uninstall.exe" 0 \
                SW_SHOWNORMAL "" "Uninstall @PACKAGE_NAME@"
 
        # Create a shortcut for the Zadig executable.

-       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig.lnk" \
+       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (@PACKAGE_NAME@).lnk" \

                "$INSTDIR\zadig.exe" "" "$INSTDIR\zadig.exe" 0 \
                SW_SHOWNORMAL "" "Zadig"
 
        # Create a shortcut for the Zadig executable (for Win XP).
                "$INSTDIR\zadig.exe" "" "$INSTDIR\zadig.exe" 0 \
                SW_SHOWNORMAL "" "Zadig"
 
        # Create a shortcut for the Zadig executable (for Win XP).

-       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (Win XP).lnk" \
+       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (@PACKAGE_NAME@, Win XP).lnk" \

                "$INSTDIR\zadig_xp.exe" "" "$INSTDIR\zadig_xp.exe" 0 \
                SW_SHOWNORMAL "" "Zadig (Win XP)"
 
                "$INSTDIR\zadig_xp.exe" "" "$INSTDIR\zadig_xp.exe" 0 \
                SW_SHOWNORMAL "" "Zadig (Win XP)"
 


@@ -195,7 +194,6 @@ Section "@PACKAGE_NAME@ (required)" Section1
        WriteRegDWORD HKLM "${REGSTR}" "NoRepair" 1
 
        # TODO: Add sigrok-cli directory to the PATH env. variable.
        WriteRegDWORD HKLM "${REGSTR}" "NoRepair" 1
 
        # TODO: Add sigrok-cli directory to the PATH env. variable.

-

 SectionEnd
 
 Section /o "Example data" Section2
 SectionEnd
 
 Section /o "Example data" Section2


@@ -219,7 +217,7 @@ Section /o "Example data" Section2
        File "${CROSS}/share/sigrok-dumps/z80/kc85/kc85-20mhz.sr"
 
        # Create a shortcut for the example data folder.
        File "${CROSS}/share/sigrok-dumps/z80/kc85/kc85-20mhz.sr"
 
        # Create a shortcut for the example data folder.

-       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Examples.lnk" \
+       CreateShortCut "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Examples (@PACKAGE_NAME@).lnk" \

                "$INSTDIR\examples" "" "$INSTDIR\examples" 0 \
                SW_SHOWNORMAL "" ""
 SectionEnd
                "$INSTDIR\examples" "" "$INSTDIR\examples" 0 \
                SW_SHOWNORMAL "" ""
 SectionEnd


@@ -228,7 +226,6 @@ SectionEnd
 # --- Uninstaller section -----------------------------------------------------
 
 Section "Uninstall"
 # --- Uninstaller section -----------------------------------------------------
 
 Section "Uninstall"

-

        # Always delete the uninstaller first (yes, this really works).
        Delete "$INSTDIR\Uninstall.exe"
 
        # Always delete the uninstaller first (yes, this really works).
        Delete "$INSTDIR\Uninstall.exe"
 


@@ -257,10 +254,10 @@ Section "Uninstall"
 
        # Delete the links from the start menu.
        Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\sigrok command-line tool.lnk"
 
        # 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 "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig.lnk"
-       Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (Win XP).lnk"
-       Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Examples.lnk"
+       Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Uninstall @PACKAGE_NAME@.lnk"
+       Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (@PACKAGE_NAME@).lnk"
+       Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Zadig (@PACKAGE_NAME@, Win XP).lnk"
+       Delete "$SMPROGRAMS\sigrok\@PACKAGE_NAME@\Examples (@PACKAGE_NAME@).lnk"

 
        # Delete the sub-directory in the start menu.
        RMDir "$SMPROGRAMS\sigrok\@PACKAGE_NAME@"
 
        # Delete the sub-directory in the start menu.
        RMDir "$SMPROGRAMS\sigrok\@PACKAGE_NAME@"


@@ -268,7 +265,6 @@ Section "Uninstall"
 
        # Delete the registry key(s).
        DeleteRegKey HKLM "${REGSTR}"
 
        # Delete the registry key(s).
        DeleteRegKey HKLM "${REGSTR}"

-

 SectionEnd
 
 
 SectionEnd