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
This commit is contained in:
Uwe Stöhr 2012-07-03 01:42:30 +02:00
parent 057543326f
commit 17ec737dd6
3 changed files with 5 additions and 4 deletions

View File

@ -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

View File

@ -176,7 +176,7 @@ SectionEnd
!macroend
#--------------------------------
# Extenral components
# External components
#Var PathAllUsers
#Var PathCurrentUser

View File

@ -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"