From f1ead62dec88eee08f5cacffee5683d31d950f47 Mon Sep 17 00:00:00 2001 From: Oleg Semyonov Date: Sun, 8 May 2011 18:21:58 +0300 Subject: [PATCH] Windows installer: remove trailing whitespaces in script file --- .../packaging/winx86/openpilotgcs.nsi | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/ground/openpilotgcs/packaging/winx86/openpilotgcs.nsi b/ground/openpilotgcs/packaging/winx86/openpilotgcs.nsi index b522c5334..47037b59b 100644 --- a/ground/openpilotgcs/packaging/winx86/openpilotgcs.nsi +++ b/ground/openpilotgcs/packaging/winx86/openpilotgcs.nsi @@ -31,7 +31,7 @@ ;-------------------------------- ; Paths - + ; Tree root locations (relative to this script location) !define NSIS_DATA_TREE "." !define GCS_BUILD_TREE "..\..\..\..\build\ground\openpilotgcs" @@ -39,7 +39,7 @@ ; Default installation folder InstallDir "$LOCALAPPDATA\OpenPilot" - + ; Get installation folder from registry if available InstallDirRegKey HKCU "Software\OpenPilot" "Install Location" @@ -83,7 +83,7 @@ ; Compression level SetCompressor /solid lzma - + ;-------------------------------- ; Branding @@ -97,7 +97,7 @@ !define MUI_WELCOMEFINISHPAGE_BITMAP_NOSTRETCH !define MUI_UNWELCOMEFINISHPAGE_BITMAP "${NSIS_DATA_TREE}\resources\welcome.bmp" !define MUI_UNWELCOMEFINISHPAGE_BITMAP_NOSTRETCH - + ;-------------------------------- ; Language selection dialog settings @@ -121,7 +121,7 @@ !insertmacro MUI_PAGE_DIRECTORY !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH - + !insertmacro MUI_UNPAGE_WELCOME !insertmacro MUI_UNPAGE_CONFIRM !insertmacro MUI_UNPAGE_COMPONENTS @@ -132,14 +132,14 @@ ; Supported languages, license files and translations !include "${NSIS_DATA_TREE}\translations\languages.nsh" - + ;-------------------------------- ; Reserve files - + ; If you are using solid compression, files that are required before ; the actual installation should be stored first in the data block, ; because this will make your installer start faster. - + !insertmacro MUI_RESERVEFILE_LANGDLL ;-------------------------------- @@ -195,7 +195,7 @@ SectionEnd Section ; create uninstall info ; Write the installation path into the registry WriteRegStr HKCU "Software\OpenPilot" "Install Location" $INSTDIR - + ; Write the uninstall keys for Windows WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenPilot" "DisplayName" "OpenPilot GCS" WriteRegStr HKCU "Software\Microsoft\Windows\CurrentVersion\Uninstall\OpenPilot" "UninstallString" '"$INSTDIR\Uninstall.exe"' @@ -217,7 +217,7 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${InSecLocalization} $(DESC_InSecLocalization) !insertmacro MUI_DESCRIPTION_TEXT ${InSecShortcuts} $(DESC_InSecShortcuts) !insertmacro MUI_FUNCTION_DESCRIPTION_END - + ;-------------------------------- ; Installer functions @@ -274,14 +274,14 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${UnSecCache} $(DESC_UnSecCache) !insertmacro MUI_DESCRIPTION_TEXT ${UnSecConfig} $(DESC_UnSecConfig) !insertmacro MUI_UNFUNCTION_DESCRIPTION_END - + ;-------------------------------- ; Uninstaller functions Function un.onInit !insertmacro MUI_UNGETLANGUAGE - + FunctionEnd ;--------------------------------