anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

installer: 2 fixes

Browse Source 
- LaTeX.nsh: assure that if MiKTeX is installed for all users also the missing packages will be installed during the configuration for all users
- configure.nsh: run configure.py twice to assure that really all missing packages are checked/installed
This commit is contained in:
Uwe Stöhr 2012-12-31 21:17:01 +01:00
parent 4f652a6f65
commit 93a61eea24
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -242,14 +242,18 @@ Function ConfigureMiKTeX
${endif} # end if $PathLaTeX != ""
# enable package installation without asking (1 = Yes, 0 = No, 2 = Ask me first)
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1" # if only for current user
${if} $MiKTeXUser != "HKCU"
${if} $MiKTeXUser == "HKCU" # if only for current user
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1"
${else}
WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoInstall" "1"
# we need to state that missing packages should be installed for all users too
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "AutoAdmin" "t"
${endif}
# set package repository (MiKTeX's primary package repository)
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}" # if only for current user
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote" # if only for current user
${if} $MiKTeXUser != "HKCU"
${if} $MiKTeXUser == "HKCU" # if only for current user
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}"
WriteRegStr HKCU "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote"
${else}
WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RemoteRepository" "${MiKTeXRepo}"
WriteRegStr HKLM "SOFTWARE\MiKTeX.org\MiKTeX\$MiKTeXVersion\MPM" "RepositoryType" "remote"
${endif}

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

@ -201,12 +201,11 @@ Section -ConfigureScript
# ask to update MiKTeX
${if} $LaTeXInstalled == "MiKTeX"
Call UpdateMiKTeX # function from latex.nsh
# for new installations a second run is necessary to give the users feedback about
# the ongoing installation of LaTeX packages
# especially for new installations a second run is necessary to install all missing package
# the reason for this is unknown, most probably it is a timeout problem, because with a fast
# Internet connection one run is sometimes sufficient
# a new installed MiKTeX needs some time until it is ready to install packages
!if ${SETUPTYPE} == BUNDLE
nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"'
!endif # end if == BUNDLE
nsExec::ExecToLog '"$INSTDIR\Python\python.exe" "$INSTDIR\Resources\configure.py"'
${endif}
SectionEnd