diff options
Diffstat (limited to 'Master/install-tl')
| -rwxr-xr-x | Master/install-tl | 40 |
1 files changed, 27 insertions, 13 deletions
diff --git a/Master/install-tl b/Master/install-tl index efc9c357c74..00d0fa33f80 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -114,6 +114,19 @@ our @collections_lang_doc; # The global variable %vars is an associative list which contains all # variables and their values which can be changed by the user. # needs to be our since TeXLive::TLUtils uses it +# +# The following values are taken from the remote tlpdb using the +# $tlpdb->option_XXXXX +# settings (i.e., taken from tlpkg/tlpsrc/00texlive-installation.tlpsrc +# +# 'option_symlinks' => 0, +# 'sys_bin' => '/usr/local/bin', +# 'sys_man' => '/usr/local/man', +# 'sys_info' => '/usr/local/info', +# 'option_doc' => 1, +# 'option_src' => 1, +# 'option_fmt' => 0, +# 'option_letter' => 0, our %vars=( # 'n_' means 'number of'. 'this_platform' => platform(), 'n_systems_available' => 0, @@ -121,16 +134,8 @@ our %vars=( # 'n_' means 'number of'. 'n_collections_selected' => 0, 'n_collections_available' => 0, 'total_size' => 0, - 'option_symlinks' => 0, - 'sys_bin' => '/usr/local/bin', - 'sys_man' => '/usr/local/man', - 'sys_info' => '/usr/local/info', 'src_splitting_supported' => 1, 'doc_splitting_supported' => 1, - 'option_doc' => 1, - 'option_src' => 1, - 'option_fmt' => 0, - 'option_letter' => 0, 'selected_scheme' => $default_scheme, ); @@ -613,6 +618,15 @@ sub load_tlpdb { if (!defined($tlpdb)) { die("Cannot load TeX Live Database from $master"); } + # set the defaults to what is specified in the tlpdb + $vars{'option_doc'} = $tlpdb->option_install_docfiles; + $vars{'option_src'} = $tlpdb->option_install_srcfiles; + $vars{'option_fmt'} = $tlpdb->option_create_formats; + $vars{'option_letter' } = ( $tlpdb->option_paper eq "letter" ? 1 : 0 ); + $vars{'option_symlinks'} = $tlpdb->option_create_symlinks; + $vars{'sys_bin'} = $tlpdb->option_sys_bin; + $vars{'sys_man'} = $tlpdb->option_sys_man; + $vars{'sys_info'} = $tlpdb->option_sys_info; } sub initialize_collections { @@ -761,20 +775,20 @@ sub save_options_into_tlpdb { $localtlpdb->option_location( (($::_media_ eq 'NET') ? "$TeXLiveURL" : abs_path($::installerdir))); $localtlpdb->option_paper($vars{'option_letter'} ? "letter" : "a4"); - $localtlpdb->option_formats($vars{'option_fmt'} ? "1" : "0"); - $localtlpdb->option_symlinks($vars{'option_symlinks'} ? "1" : "0"); + $localtlpdb->option_create_formats($vars{'option_fmt'} ? "1" : "0"); + $localtlpdb->option_create_symlinks($vars{'option_symlinks'} ? "1" : "0"); $localtlpdb->option_sys_bin($vars{'sys_bin'}); $localtlpdb->option_sys_info($vars{'sys_info'}); $localtlpdb->option_sys_man($vars{'sys_man'}); - $localtlpdb->option_docfiles($vars{'option_doc'} ? "1" : "0"); - $localtlpdb->option_srcfiles($vars{'option_doc'} ? "1" : "0"); + $localtlpdb->option_install_docfiles($vars{'option_doc'} ? "1" : "0"); + $localtlpdb->option_install_srcfiles($vars{'option_doc'} ? "1" : "0"); my @archs; foreach (keys %vars) { if (m/^binary_(.*)$/ ) { if ($vars{$_}) { push @archs, $1; } } } - $localtlpdb->option_archs(@archs); + $localtlpdb->option_available_archs(@archs); $localtlpdb->save(); } |