diff options
Diffstat (limited to 'Master/install-tl')
| -rwxr-xr-x | Master/install-tl | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/Master/install-tl b/Master/install-tl index aa1365077f0..e2b445fa61c 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -83,6 +83,7 @@ if (win32) { &remove_desktop_shortcut &remove_menu_shortcut &create_uninstaller + &maybe_make_ro )); } @@ -720,12 +721,24 @@ sub do_installation { tlwarn("Nothing selected, nothing to install, exiting!\n"); exit 1; } + # maybe_make_ro tests for admin, local drive and NTFS before proceeding. + # setting the root read-only automatically locks everything below it. + # do TEXDIR now, before removing final slash + mkdirhier "$vars{'TEXDIR'}"; + if (win32()) { + TeXLive::TLWinGoo::maybe_make_ro ($vars{'TEXDIR'}); + } # remove final slash from TEXDIR even if it is the root of a drive $vars{'TEXDIR'} =~ s!/$!!; # do the actual installation make_var_skeleton "$vars{'TEXMFSYSVAR'}"; make_local_skeleton "$vars{'TEXMFLOCAL'}"; mkdirhier "$vars{'TEXMFSYSCONFIG'}"; + if (win32()) { + TeXLive::TLWinGoo::maybe_make_ro ($vars{'TEXMFSYSVAR'}); + TeXLive::TLWinGoo::maybe_make_ro ($vars{'TEXMFLOCAL'}); + TeXLive::TLWinGoo::maybe_make_ro ($vars{'TEXMFSYSCONFIG'}); + } if ($vars{'in_place'}) { $localtlpdb = $tlpdb; @@ -1020,6 +1033,7 @@ sub do_tlpdb_postactions { $vars{'option_desktop_integration'}, $vars{'option_post_code'}); } + if (win32) { TeXLive::TLWinGoo::update_assocs(); } info ("finished with package-specific postactions\n"); return 0; # xxxx errcount @@ -1644,7 +1658,9 @@ sub do_install_packages { tlwarn("Rerunning the installer will try to restart the installation.\n"); tlwarn("Or you can restart by running the installer with:\n"); if (win32()) { - tlwarn(" install-tl.bat --profile $profile_name [EXTRA-ARGS]\n"); + tlwarn(" install-tl-windows.bat --profile $profile_name [EXTRA-ARGS]\n" + ."or\n" + ." install-tl-advanced.bat --profile $profile_name [EXTRA-ARGS]\n"); } else { tlwarn(" install-tl --profile $profile_name [EXTRA-ARGS]\n"); } @@ -2147,7 +2163,9 @@ install-tl - TeX Live cross-platform installer install-tl [I<option>]... -install-tl.bat [I<option>]... +install-tl-windows.bat [I<option>]... + +install-tl-advanced.bat [I<option>]... =head1 DESCRIPTION |