diff options
Diffstat (limited to 'Master/install-tl')
| -rwxr-xr-x | Master/install-tl | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/Master/install-tl b/Master/install-tl index 6264b543852..121a55673ad 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -747,6 +747,9 @@ sub do_installation { calc_depends(); save_options_into_tlpdb(); + # we need to do that dir, since we use the TLPDB->install_package which + # might change into texmf-dist for relocated packages + mkdirhier "$vars{'TEXDIR'}/texmf-dist"; do_install_packages(); if ($opt_custom_bin) { $vars{'this_platform'} = "custom"; @@ -1626,6 +1629,13 @@ sub do_install_packages { foreach my $package (sort keys %install) { push @what, $package if ($install{$package} == 1); } + # temporary unset the localtlpdb options responsible for + # running all kind of postactions, since install_packages + # would call them without the PATH already set up + # we are doing this anyway in do_postinstall_actions + $localtlpdb->option ("desktop_integration", "0"); + $localtlpdb->option ("file_assocs", "0"); + $localtlpdb->option ("post_code", "0"); if (!install_packages($tlpdb,$media,$localtlpdb,\@what, $vars{'option_src'},$vars{'option_doc'})) { my $profile_name = "installation.profile"; @@ -1641,6 +1651,10 @@ sub do_install_packages { flushlog(); exit(1); } + $localtlpdb->option ("desktop_integration", $vars{'option_desktop_integration'} ? "1" : "0"); + $localtlpdb->option ("file_assocs", $vars{'option_file_assocs'}); + $localtlpdb->option ("post_code", $vars{'option_post_code'} ? "1" : "0"); + $localtlpdb->save; } # for later complete removal we want to save some options and values |