The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 40fb3cca6422b6f7e8afcd526fc7464436c03633 Author: Uwe Stöhr <uwesto...@lyx.org> Date: Mon Jul 2 23:37:15 2012 +0200 installer: fix a permission right issue We must prevent that LyX is installed as admin and then afterwards the same LyX version also without admin privileges. diff --git a/development/Win32/packaging/installer/include/init.nsh b/development/Win32/packaging/installer/include/init.nsh index fe090e1..f4cf09b 100644 --- a/development/Win32/packaging/installer/include/init.nsh +++ b/development/Win32/packaging/installer/include/init.nsh @@ -42,7 +42,16 @@ Function .onInit ${endif} # check if LyX is already installed - ReadRegStr $0 SHCTX "${APP_UNINST_KEY}" "Publisher" + ${if} $MultiUser.Privileges == "Admin" + ${orif} $MultiUser.Privileges == "Power" + ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "Publisher" + ${else} + ReadRegStr $0 HKCU "${APP_UNINST_KEY}" "Publisher" + # handle also the case that LyX is already installed in HKLM + ${if} $0 == "" + ReadRegStr $0 HKLM "${APP_UNINST_KEY}" "Publisher" + ${endif} + ${endif} ${if} $0 != "" MessageBox MB_OK|MB_ICONSTOP "$(StillInstalled)" Abort ----------------------------------------------------------------------- Summary of changes: .../Win32/packaging/installer/include/init.nsh | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) hooks/post-receive -- The LyX Source Repository