anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-25 05:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Win installer: fix a MiKTeX package issue

Browse Source 
since a few months MiKTeX's package manager required the option "--admin" when calling it with admin privileges

- also register the .lyx22 file extension to be opened with the future LyX 2.2.4
This commit is contained in:
Uwe Stöhr 2017-10-31 22:18:06 +01:00
parent c323be70b4
commit bffb17112b
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
development/Win32/packaging/installer/include/LaTeX.nsh
View File

@ -277,11 +277,6 @@ Function ConfigureMiKTeX
SetOutPath "$PathLaTeXLocal\tex\latex\lyx" SetOutPath "$PathLaTeXLocal\tex\latex\lyx"
CopyFiles /SILENT "$INSTDIR\Resources\tex\*.*" "$PathLaTeXLocal\tex\latex\lyx" CopyFiles /SILENT "$INSTDIR\Resources\tex\*.*" "$PathLaTeXLocal\tex\latex\lyx"
${endif} ${endif}
# Hungarian support
# The following seems to be unnecesary since 2015, therefore it is commented
# this is a replacement therefore do this in every case
#SetOutPath "$PathLaTeXLocal\tex\generic\babel"
#File "${FILES_DVIPOST_PKG}\magyar.ldf"
# install a Perl interpreter for splitindex and pdfcrop # install a Perl interpreter for splitindex and pdfcrop
SetOutPath "$INSTDIR" SetOutPath "$INSTDIR"
@ -342,7 +337,18 @@ Function ConfigureMiKTeX
NoAutoInstall: NoAutoInstall:
# update MiKTeX's package file list # update MiKTeX's package file list
ExecWait '$PathLaTeX\mpm.exe --update-fndb' ${if} $MultiUser.Privileges != "Admin"
${andif} $MultiUser.Privileges != "Power"
# call the non-admin version
nsExec::ExecToLog "$PathLaTeX\mpm.exe --update-fndb"
${else}
${if} $MiKTeXUser != "HKCU" # call the admin version
nsExec::ExecToLog "$PathLaTeX\mpm.exe --admin --update-fndb"
${else}
nsExec::ExecToLog "$PathLaTeX\mpm.exe --update-fndb"
${endif}
${endif}
Pop $UpdateFNDBReturn # Return value
# we must return to 32bit because LyX is a 32bit application # we must return to 32bit because LyX is a 32bit application
SetRegView 32 SetRegView 32

7
development/Win32/packaging/installer/setup/configure.nsh
View File

@ -107,7 +107,12 @@ Section -Configure
# .lyx20 # .lyx20
WriteRegStr SHCTX "Software\Classes\${APP_EXT}20" "" "${APP_REGNAME_DOC}" WriteRegStr SHCTX "Software\Classes\${APP_EXT}20" "" "${APP_REGNAME_DOC}"
WriteRegStr SHCTX "Software\Classes\${APP_EXT}20" "Content Type" "${APP_MIME_TYPE}" WriteRegStr SHCTX "Software\Classes\${APP_EXT}20" "Content Type" "${APP_MIME_TYPE}"
# .lyx21 don't set this, because this is designed to be opened with LyX 2.1.x # .lyx21
WriteRegStr SHCTX "Software\Classes\${APP_EXT}21" "" "${APP_REGNAME_DOC}"
WriteRegStr SHCTX "Software\Classes\${APP_EXT}21" "Content Type" "${APP_MIME_TYPE}"
# .lyx22
WriteRegStr SHCTX "Software\Classes\${APP_EXT}22" "" "${APP_REGNAME_DOC}"
WriteRegStr SHCTX "Software\Classes\${APP_EXT}22" "Content Type" "${APP_MIME_TYPE}"
# Refresh shell # Refresh shell
${RefreshShellIcons} ${RefreshShellIcons}