From: Uwe Stöhr <uwestoehr@lyx.org>
Date: Mon, 2 Jul 2012 23:42:30 +0000 (+0200)
Subject: installer: 3 fixes
X-Git-Tag: 2.1.0beta1~1680
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=17ec737dd63c4175efa3433754b7f849757f2c28;p=features.git

installer: 3 fixes

- uninstall.nsh: don't uninstall the user preferences by default
- configure.nsh:
 - set also the .lyx file association when the user is not admin
 - fix the path in which the LyX start menu shortcut is executed
---

diff --git a/development/Win32/packaging/installer/setup/configure.nsh b/development/Win32/packaging/installer/setup/configure.nsh
index 2a8093b616..6d90669e31 100644
--- a/development/Win32/packaging/installer/setup/configure.nsh
+++ b/development/Win32/packaging/installer/setup/configure.nsh
@@ -23,6 +23,7 @@ Section -InstallData
   
   # Start Menu shortcut
   # There is only one shortcut to the application, so it should be in the main group
+  SetOutPath "$INSTDIR\bin" # this is the folder in which the shortcut is executed
   CreateDirectory "$SMPROGRAMS\$StartmenuFolder"
   CreateShortCut "$SMPROGRAMS\$StartmenuFolder\${APP_NAME}.lnk" "$INSTDIR\${APP_RUN}" "" "$INSTDIR\${APP_RUN}" "" "" "" "${APP_INFO}"
   # create desktop icon
@@ -59,7 +60,7 @@ Section -Configure
   # Associate .lyx files with LyX for current user of all users
 
   ${if} $CreateFileAssociations == "true"
-   WriteRegStr HKLM "${APP_DIR_REGKEY}" "" "$INSTDIR\${APP_RUN}"
+   WriteRegStr SHCTX "${APP_DIR_REGKEY}" "" "$INSTDIR\${APP_RUN}"
   ${endif}
 
   # Write information about file type
diff --git a/development/Win32/packaging/installer/setup/install.nsh b/development/Win32/packaging/installer/setup/install.nsh
index 4c5b920317..5b3562b39c 100644
--- a/development/Win32/packaging/installer/setup/install.nsh
+++ b/development/Win32/packaging/installer/setup/install.nsh
@@ -176,7 +176,7 @@ SectionEnd
 !macroend
 
 #--------------------------------
-# Extenral components
+# External components
 
 #Var PathAllUsers
 #Var PathCurrentUser
diff --git a/development/Win32/packaging/installer/setup/uninstall.nsh b/development/Win32/packaging/installer/setup/uninstall.nsh
index 57cd999b3e..2eeaa07d48 100644
--- a/development/Win32/packaging/installer/setup/uninstall.nsh
+++ b/development/Win32/packaging/installer/setup/uninstall.nsh
@@ -107,7 +107,7 @@ SectionEnd
 
 #---------------------------------
 # user preferences
-Section "un.$(UnLyXPreferencesTitle)" un.SecUnPreferences
+Section /o "un.$(UnLyXPreferencesTitle)" un.SecUnPreferences
 
  # remove LyX's config files
  StrCpy $AppSubfolder ${APP_DIR_USERDATA}
@@ -117,7 +117,7 @@ SectionEnd
 
 #---------------------------------
 # MiKTeX
-Section "un.MiKTeX" un.SecUnMiKTeX
+Section /o "un.MiKTeX" un.SecUnMiKTeX
 
  ${if} $LaTeXInstalled == "MiKTeX" # only uninstall MiKTeX when it was installed together with LyX 
   ReadRegStr $1 HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\MiKTeX ${MiKTeXDeliveredVersion}" "UninstallString"