anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Wininstaller2: small cosmetic bugfix

Browse Source
This commit is contained in:
Eugene Chornyi 2020-11-30 07:02:46 +01:00
parent 822a9ef573
commit baf792f1b0
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
development/Win32/packaging/installer2/src/main.nsh
View File

@ -957,15 +957,6 @@ Section -UninstallInfoRegistry # Registry information in "SOFTWARE\Microsoft\Win
SectionEnd SectionEnd
Section -ConfigureScript # Runs the configure.py script Section -ConfigureScript # Runs the configure.py script
${StrStr} $0 $LatexPath "\miktex\bin"
# R9 is used in $(TEXT_CONFIGURE_LYX)
${If} $0 == "" # TexLive
StrCpy $R9 "TeXLive"
${Else}
StrCpy $R9 "MiKTeX"
${EndIf}
StrCpy $LaTeXInstalled $R9 # FIXME remove
DetailPrint $(TEXT_CONFIGURE_LYX) # Uses R9 to display the name of the installed latex distribution
# Manipulate PATH environment of the running installer process, so that configure.py can find all the stuff needed # Manipulate PATH environment of the running installer process, so that configure.py can find all the stuff needed
ReadEnvStr $0 "PATH" ReadEnvStr $0 "PATH"
@ -975,6 +966,17 @@ Section -ConfigureScript # Runs the configure.py script
Call PrepareShellCTX Call PrepareShellCTX
SetShellVarContext current # Otherwise $APPDATA would return C:\ProgrammData instead of C:\Users\username\AppData\Roaming SetShellVarContext current # Otherwise $APPDATA would return C:\ProgrammData instead of C:\Users\username\AppData\Roaming
SetOutPath "$APPDATA\LyX${VERSION_MAJOR}.${VERSION_MINOR}" # Need to run configure from the user dir, because it creates .lst files and some folders. SetOutPath "$APPDATA\LyX${VERSION_MAJOR}.${VERSION_MINOR}" # Need to run configure from the user dir, because it creates .lst files and some folders.
${StrStr} $0 $LatexPath "\miktex\bin"
# R9 is used in $(TEXT_CONFIGURE_LYX)
${If} $0 == "" # TexLive
StrCpy $R9 "TeXLive"
${Else}
StrCpy $R9 "MiKTeX"
${EndIf}
StrCpy $LaTeXInstalled $R9 # FIXME remove
DetailPrint $(TEXT_CONFIGURE_LYX) # Uses R9 to display the name of the installed latex distribution
nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"' nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"'
Pop $0 # Return value Pop $0 # Return value
SectionEnd SectionEnd