From 69b2843d461ee3eb21fce5126ac458ea75d6c969 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Wed, 29 Feb 2012 22:40:03 +0000 Subject: [PATCH] installer: - fix an uninstallation bug that user settings were not remove if requested - whitespace fix git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@40814 a592a061-630c-0410-9148-cb99ea01b6c8 --- .../Win32/packaging/installer/include/declarations.nsh | 2 +- development/Win32/packaging/installer/include/detection.nsh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/development/Win32/packaging/installer/include/declarations.nsh b/development/Win32/packaging/installer/include/declarations.nsh index 1bccc0cd5b..a95668aa17 100644 --- a/development/Win32/packaging/installer/include/declarations.nsh +++ b/development/Win32/packaging/installer/include/declarations.nsh @@ -44,7 +44,7 @@ Configuration of LyX installer !define APP_SERIES_KEY "${APP_VERSION_MAJOR}${APP_VERSION_MINOR}${APP_VERSION_REVISION}" !define APP_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\${APP_NAME}.exe" !define APP_DIR "${APP_NAME} ${APP_SERIES_NAME}" -!define APP_DIR_USERDATA "lyx${APP_VERSION_MAJOR}${APP_VERSION_MINOR}" +!define APP_DIR_USERDATA "${APP_NAME}${APP_VERSION_MAJOR}.${APP_VERSION_MINOR}" !define APP_INFO "${APP_NAME} - The Document Processor" !define APP_COPYRIGHT "LyX is Copyright © 1995 by Matthias Ettrich, 1995-2012 by the LyX Team" diff --git a/development/Win32/packaging/installer/include/detection.nsh b/development/Win32/packaging/installer/include/detection.nsh index 7801423daa..33b0c7dac6 100644 --- a/development/Win32/packaging/installer/include/detection.nsh +++ b/development/Win32/packaging/installer/include/detection.nsh @@ -39,8 +39,8 @@ Function MissingPrograms GSloop: EnumRegKey $1 HKLM "Software\GPL Ghostscript" $3 ${if} $1 != "" - ReadRegStr $2 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GPL Ghostscript $1" "DisplayName" - StrCpy $0 "Software\GPL Ghostscript\$1" + ReadRegStr $2 HKLM "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\GPL Ghostscript $1" "DisplayName" + StrCpy $0 "Software\GPL Ghostscript\$1" ${if} $2 == "" # if nothing was found in the uninstall section ReadRegStr $2 HKLM "SOFTWARE\GPL Ghostscript" "OnlyWithLyX" # check if Ghostscript was installed together with LyX ${endif} -- 2.39.2