diff options
Diffstat (limited to 'Master')
| -rwxr-xr-x | Master/install-tl | 114 | ||||
| -rw-r--r-- | Master/tlpkg/TeXLive/TLPDB.pm | 6 | ||||
| -rwxr-xr-x | Master/tlpkg/bin/tl-update-tlnet | 12 | ||||
| -rw-r--r-- | Master/tlpkg/installer/install-menu-perltk.pl | 48 | ||||
| -rw-r--r-- | Master/tlpkg/installer/install-menu-text.pl | 100 | ||||
| -rw-r--r-- | Master/tlpkg/installer/install-menu-wizard.pl | 16 | ||||
| -rw-r--r-- | Master/tlpkg/installer/installer-options.txt | 16 |
7 files changed, 156 insertions, 156 deletions
diff --git a/Master/install-tl b/Master/install-tl index d3e1a16fcaf..2368ff9f6d7 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -124,15 +124,15 @@ our @collections_std; # needs to be our since TeXLive::TLUtils uses it # # The following values are taken from the remote tlpdb using the -# $tlpdb->option_XXXXX +# $tlpdb->tlpdbopt_XXXXX # settings (i.e., taken from tlpkg/tlpsrc/00texlive.installation.tlpsrc # -# 'option_sys_bin' => '/usr/local/bin', -# 'option_sys_man' => '/usr/local/man', -# 'option_sys_info' => '/usr/local/info', -# 'option_install_docfiles' => 1, -# 'option_install_srcfiles' => 1, -# 'option_create_formats' => 0, +# 'tlpdbopt_sys_bin' => '/usr/local/bin', +# 'tlpdbopt_sys_man' => '/usr/local/man', +# 'tlpdbopt_sys_info' => '/usr/local/info', +# 'tlpdbopt_install_docfiles' => 1, +# 'tlpdbopt_install_srcfiles' => 1, +# 'tlpdbopt_create_formats' => 0, our %vars=( # 'n_' means 'number of'. 'this_platform' => '', 'n_systems_available' => 0, @@ -194,7 +194,7 @@ $::alternative_selector = 0; # do not debug translations by default $::debug_translation = 0; -# some strings to describe the different meanings of option_file_assoc +# some strings to describe the different meanings of tlpdbopt_file_assoc $::fileassocdesc[0] = "None"; $::fileassocdesc[1] = "Only new"; $::fileassocdesc[2] = "All"; @@ -776,14 +776,14 @@ sub final_remote_init { sub do_installation { if (win32()) { - non_admin() if !$vars{'option_w32_multi_user'}; + non_admin() if !$vars{'tlpdbopt_w32_multi_user'}; } if ($vars{'instopt_portable'}) { - $vars{'option_desktop_integration'} = 0; - $vars{'option_menu_integration'} = 0; - $vars{'option_file_assocs'} = 0; + $vars{'tlpdbopt_desktop_integration'} = 0; + $vars{'tlpdbopt_menu_integration'} = 0; + $vars{'tlpdbopt_file_assocs'} = 0; $vars{'instopt_path'} = 0; - $vars{'option_w32_multi_user'} = 0; + $vars{'tlpdbopt_w32_multi_user'} = 0; } if ($vars{'selected_scheme'} ne "scheme-infraonly" && $vars{'n_collections_selected'} <= 0) { @@ -1065,7 +1065,7 @@ operations might be disturbed.\n\n"; # option settings in launcher.ini if (win32() && !$vars{'instopt_portable'}) { - if ($vars{'option_file_assocs'} != 1 || !$vars{'instopt_path'}) { + if ($vars{'tlpdbopt_file_assocs'} != 1 || !$vars{'instopt_path'}) { # create higher priority tlaunch.ini with adjusted settings # whether or not launcher mode (desktop integration 2) # was selected @@ -1077,7 +1077,7 @@ operations might be disturbed.\n\n"; $errcount += wsystem("re-running", "mktexlsr", $TEXMFSYSVAR,$TEXMFSYSCONFIG); if (win32() and !$vars{'instopt_portable'} and !$opt_in_place) { - if ($vars{'option_desktop_integration'} != 2) { + if ($vars{'tlpdbopt_desktop_integration'} != 2) { create_uninstaller($vars{'TEXDIR'}); } else { $errcount += wsystem ( @@ -1094,7 +1094,7 @@ operations might be disturbed.\n\n"; } # all formats option - if ($vars{'option_create_formats'}) { + if ($vars{'tlpdbopt_create_formats'}) { if (-x "$plat_bindir/fmtutil-sys$progext") { info("pre-generating all format files, be patient...\n"); $errcount += run_postinst_cmd( @@ -1109,7 +1109,7 @@ operations might be disturbed.\n\n"; # for portable, this option should be unset # it should not be necessary to test separately for portable do_path_adjustments() if - $vars{'instopt_path'} and $vars{option_desktop_integration} != 2; + $vars{'instopt_path'} and $vars{tlpdbopt_desktop_integration} != 2; # now do the system integration: # on unix this means setting up symlinks @@ -1135,19 +1135,19 @@ sub do_tlpdb_postactions { foreach my $package ($usedtlpdb->list_packages) { # !!! alert: parameter 4 is menu shortcuts, parameter 5 does nothing !!! - if ($vars{'option_desktop_integration'}==2) { + if ($vars{'tlpdbopt_desktop_integration'}==2) { # skip creation of shortcuts and file associations if (!TeXLive::TLUtils::do_postaction( "install", $usedtlpdb->get_package($package), - 0, 0, 0, $vars{'option_post_code'})) { $ret += 1; } + 0, 0, 0, $vars{'tlpdbopt_post_code'})) { $ret += 1; } } else { # create shortcuts and file associations # according to corresponding options if (!TeXLive::TLUtils::do_postaction( "install", $usedtlpdb->get_package($package), - $vars{'option_file_assocs'}, - $vars{'option_desktop_integration'}, 0, - $vars{'option_post_code'})) { $ret += 1; } + $vars{'tlpdbopt_file_assocs'}, + $vars{'tlpdbopt_desktop_integration'}, 0, + $vars{'tlpdbopt_post_code'})) { $ret += 1; } } } # windows: alert the system about changed file associations @@ -1177,7 +1177,7 @@ sub rewrite_tlaunch_ini { $\ = "\n"; print OUT $ini; print OUT "[General]"; - print OUT "FILETYPES=$fts[$vars{'option_file_assocs'}]"; + print OUT "FILETYPES=$fts[$vars{'tlpdbopt_file_assocs'}]"; print OUT "SEARCHPATH=$vars{'instopt_path'}\n"; close OUT; `mktexlsr $tmfsysvar`; @@ -1197,12 +1197,12 @@ sub do_path_adjustments { info ("running path adjustment actions\n"); if (win32()) { TeXLive::TLUtils::w32_add_to_path($vars{'TEXDIR'}.'/bin/win32', - $vars{'option_w32_multi_user'}); + $vars{'tlpdbopt_w32_multi_user'}); broadcast_env(); } else { TeXLive::TLUtils::add_symlinks($vars{'TEXDIR'}, $vars{'this_platform'}, - $vars{'option_sys_bin'}, $vars{'option_sys_man'}, - $vars{'option_sys_info'}); + $vars{'tlpdbopt_sys_bin'}, $vars{'tlpdbopt_sys_man'}, + $vars{'tlpdbopt_sys_info'}); } info ("finished with path adjustment actions\n"); } # do_path_adjustments @@ -1564,8 +1564,8 @@ sub calc_depends { $install{$p} = 0; next; } - $size+=$tlpobj->docsize if $vars{'option_install_docfiles'}; - $size+=$tlpobj->srcsize if $vars{'option_install_srcfiles'}; + $size+=$tlpobj->docsize if $vars{'tlpdbopt_install_docfiles'}; + $size+=$tlpobj->srcsize if $vars{'tlpdbopt_install_srcfiles'}; $size+=$tlpobj->runsize; foreach $a (@archs) { $size += $tlpobj->binsize->{$a} if defined($tlpobj->binsize->{$a}); @@ -1627,18 +1627,18 @@ END_EXPLICIT_MIRROR # since we might have loaded values via a -profile-seed, # make sure that we don't overwrite default values for my $o (keys %TeXLive::TLConfig::TLPDBOptions) { - $vars{"option_$o"} = $tlpdb->option($o) - if (!defined($profiledata{"option_$o"})); + $vars{"tlpdbopt_$o"} = $tlpdb->option($o) + if (!defined($profiledata{"tlpdbopt_$o"})); } if (win32()) { # below, we really mean (start) menu integration. # 2016: always menu shortcuts, never desktop shortcuts, whatever the setting # 2017: new option value 2: launcher instead of menu. # in portable case, shortcuts sanitized away elsewhere - $vars{'option_desktop_integration'} = 1; + $vars{'tlpdbopt_desktop_integration'} = 1; # we have to make sure that this option is set to 0 in case # that a non-admin is running the installations program - $vars{'option_w32_multi_user'} = 0 if (!admin()); + $vars{'tlpdbopt_w32_multi_user'} = 0 if (!admin()); } # select scheme: either $vars{'selected_scheme'} or $default_scheme @@ -1779,9 +1779,9 @@ sub create_profile { foreach my $key (sort keys %vars) { print $fh "$key $vars{$key}\n" if $save_cols and $key=~/^collection/ and $vars{$key}==1; - # we don't save option_location - next if ($key eq "option_location"); - print $fh "$key $vars{$key}\n" if $key =~ /^option_/; + # we don't save tlpdbopt_location + next if ($key eq "tlpdbopt_location"); + print $fh "$key $vars{$key}\n" if $key =~ /^tlpdbopt_/; print $fh "$key $vars{$key}\n" if $key =~ /^instopt_/; print $fh "$key $vars{$key}\n" if defined($path_keys{$key}); print $fh "$key $vars{$key}\n" if (($key =~ /^binary_/) && $vars{$key}); @@ -1821,9 +1821,9 @@ sub read_profile { } next; } - if (m/^option_/) { + if (m/^tlpdbopt_/) { my $o = $_; - $o =~ s/^option_//; + $o =~ s/^tlpdbopt_//; # we do not support setting the location in the profile # could be done, but might be tricky .. next if ($o eq 'location'); @@ -1897,8 +1897,8 @@ sub read_profile { sub sanitise_options { # portable option overrides any system integration options $vars{'instopt_path'} = 0 if $vars{'instopt_portable'}; - $vars{'option_file_assocs'} = 0 if $vars{'instopt_portable'}; - $vars{'option_desktop_integration'} = 0 if $vars{'instopt_portable'}; + $vars{'tlpdbopt_file_assocs'} = 0 if $vars{'instopt_portable'}; + $vars{'tlpdbopt_desktop_integration'} = 0 if $vars{'instopt_portable'}; } # sanitise_options sub do_install_packages { @@ -1914,7 +1914,7 @@ sub do_install_packages { $localtlpdb->option ("file_assocs", "0"); $localtlpdb->option ("post_code", "0"); if (!install_packages($tlpdb,$media,$localtlpdb,\@what, - $vars{'option_install_srcfiles'},$vars{'option_install_docfiles'})) { + $vars{'tlpdbopt_install_srcfiles'},$vars{'tlpdbopt_install_docfiles'})) { my $profile_name = "installation.profile"; create_profile($profile_name); tlwarn("Installation failed.\n"); @@ -1932,9 +1932,9 @@ sub do_install_packages { } # restore options in tlpdb $localtlpdb->option ( - "desktop_integration", $vars{'option_desktop_integration'}); - $localtlpdb->option ("file_assocs", $vars{'option_file_assocs'}); - $localtlpdb->option ("post_code", $vars{'option_post_code'} ? "1" : "0"); + "desktop_integration", $vars{'tlpdbopt_desktop_integration'}); + $localtlpdb->option ("file_assocs", $vars{'tlpdbopt_file_assocs'}); + $localtlpdb->option ("post_code", $vars{'tlpdbopt_post_code'} ? "1" : "0"); $localtlpdb->save; } # do_install_packages @@ -1952,7 +1952,7 @@ sub save_options_into_tlpdb { $localtlpdb->option ("location", $final_loc); } for my $o (keys %TeXLive::TLConfig::TLPDBOptions) { - $localtlpdb->option ($o, $vars{"option_$o"}); + $localtlpdb->option ($o, $vars{"tlpdbopt_$o"}); } my @archs; foreach (keys %vars) { @@ -2079,25 +2079,25 @@ sub import_settings_from_old_tlpdb { # # now for the settings # set the defaults to what is specified in the tlpdb - $vars{'option_install_docfiles'} = + $vars{'tlpdbopt_install_docfiles'} = $previoustlpdb->option_pkg("00texlive.installation", "install_docfiles"); - $vars{'option_install_srcfiles'} = + $vars{'tlpdbopt_install_srcfiles'} = $previoustlpdb->option_pkg("00texlive.installation", "install_srcfiles"); - $vars{'option_create_formats'} = + $vars{'tlpdbopt_create_formats'} = $previoustlpdb->option_pkg("00texlive.installation", "create_formats"); - $vars{'option_desktop_integration'} = 1 if win32(); + $vars{'tlpdbopt_desktop_integration'} = 1 if win32(); $vars{'instopt_path'} = $previoustlpdb->option_pkg("00texlive.installation", "path"); $vars{'instopt_path'} = 0 if !defined($vars{'instopt_path'}); $vars{'instopt_path'} = 1 if win32(); - $vars{'option_sys_bin'} = + $vars{'tlpdbopt_sys_bin'} = $previoustlpdb->option_pkg("00texlive.installation", "sys_bin"); - $vars{'option_sys_man'} = + $vars{'tlpdbopt_sys_man'} = $previoustlpdb->option_pkg("00texlive.installation", "sys_man"); $vars{'sys_info'} = @@ -2678,18 +2678,18 @@ C<instopt_write18_restricted> (default 1, enable write8 for a restricted set of programs), C<instopt_path> (default 0 on Unix, 1 on Windows, adjust PATH environment). -=item B<tlpdb options> (those with prefix C<option_>) +=item B<tlpdb options> (those with prefix C<tlpdbopt_>) The definitive list is give in C<TeXLive::TLConfig.pm> in C<%TeXLive::TLConfig::TLPDBOptions>, together with explanations. -All items B<but> for C<option_location> can be specified. +All items B<but> for C<tlpdbopt_location> can be specified. The current list is given below: -C<option_autobackup>, C<option_backupdir>, C<option_create_formats>, -C<option_desktop_integration>, C<option_file_assocs>, C<option_install_docfiles>, -C<option_install_srcfiles>, C<option_post_code>, -C<option_sys_bin>, C<option_sys_info>, C<option_sys_man>, -C<option_w32_multi_user>, C<option_generate_updmap> +C<tlpdbopt_autobackup>, C<tlpdbopt_backupdir>, C<tlpdbopt_create_formats>, +C<tlpdbopt_desktop_integration>, C<tlpdbopt_file_assocs>, C<tlpdbopt_install_docfiles>, +C<tlpdbopt_install_srcfiles>, C<tlpdbopt_post_code>, +C<tlpdbopt_sys_bin>, C<tlpdbopt_sys_info>, C<tlpdbopt_sys_man>, +C<tlpdbopt_w32_multi_user>, C<tlpdbopt_generate_updmap> =item B<path options> diff --git a/Master/tlpkg/TeXLive/TLPDB.pm b/Master/tlpkg/TeXLive/TLPDB.pm index 32119ea0f75..bc1adef0249 100644 --- a/Master/tlpkg/TeXLive/TLPDB.pm +++ b/Master/tlpkg/TeXLive/TLPDB.pm @@ -1917,9 +1917,9 @@ sub remove_package { # files will be gone ... if (defined($opts{'nopostinstall'}) && $opts{'nopostinstall'}) { &TeXLive::TLUtils::do_postaction("remove", $tlp, - 0, # option_file_assocs, - 0, # option_desktop_integration, menu part - 0, # option_desktop_integration, desktop part + 0, # tlpdbopt_file_assocs, + 0, # tlpdbopt_desktop_integration, menu part + 0, # tlpdbopt_desktop_integration, desktop part $localtlpdb->option("post_code")); } # diff --git a/Master/tlpkg/bin/tl-update-tlnet b/Master/tlpkg/bin/tl-update-tlnet index 21540b77c37..05ee6d5e099 100755 --- a/Master/tlpkg/bin/tl-update-tlnet +++ b/Master/tlpkg/bin/tl-update-tlnet @@ -120,12 +120,12 @@ TEXMFSYSCONFIG $tltryinst/$yyyy/texmf-config TEXMFSYSVAR $tltryinst/$yyyy/texmf-var TEXMFLOCAL $tltryinst/texmf-local TEXMFHOME ~/texmf -option_doc 1 -option_fmt 1 -option_letter 0 -option_src 1 -option_path 0 -option_adjustrepo 0 +tlpdbopt_install_docfiles 1 +tlpdbopt_install_srcfiles 1 +tlpdbopt_create_formats 1 +instopt_letter 0 +instopt_path 0 +instopt_adjustrepo 0 " >texlive.profile # silence warnings we do not need to see. diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl index d781fe5e9f6..9733009886a 100644 --- a/Master/tlpkg/installer/install-menu-perltk.pl +++ b/Master/tlpkg/installer/install-menu-perltk.pl @@ -129,14 +129,14 @@ $::run_menu = \&run_menu_perltk; sub setup_perltk_local_strings { $portableyesno = $::yesno[$vars{'instopt_portable'}]; $letteryesno = $::letterdesc[$vars{'instopt_letter'}]; - $fmtyesno = $::yesno[$vars{'option_create_formats'}]; - $srcyesno = $::yesno[$vars{'option_install_srcfiles'}]; - $deskintyesno = $::deskintdesc[$vars{'option_desktop_integration'}]; + $fmtyesno = $::yesno[$vars{'tlpdbopt_create_formats'}]; + $srcyesno = $::yesno[$vars{'tlpdbopt_install_srcfiles'}]; + $deskintyesno = $::deskintdesc[$vars{'tlpdbopt_desktop_integration'}]; $pathadjyesno = $::yesno[$vars{'instopt_path'}]; - $fileassocyesno = $::fileassocdesc[$vars{'option_file_assocs'}]; + $fileassocyesno = $::fileassocdesc[$vars{'tlpdbopt_file_assocs'}]; $editoryesno = $::yesno[$vars{'collection-texworks'}]; - $adminallyesno = $::yesno[$vars{'option_w32_multi_user'}]; - $docyesno = $::yesno[$vars{'option_install_docfiles'}]; + $adminallyesno = $::yesno[$vars{'tlpdbopt_w32_multi_user'}]; + $docyesno = $::yesno[$vars{'tlpdbopt_install_docfiles'}]; $restrictedyesno = $::yesno[$vars{'instopt_write18_restricted'}]; $adjustrepoyesno = $::yesno[$vars{'instopt_adjustrepo'}]; } @@ -491,7 +491,7 @@ Please select a different mirror.', $format_toggle_button = $fr->Button( -text => __("Toggle"), -command => sub { - toggle_and_set_opt_variable(\$vars{'option_create_formats'}, \$fmtyesno); }) + toggle_and_set_opt_variable(\$vars{'tlpdbopt_create_formats'}, \$fmtyesno); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); if ($vars{'doc_splitting_supported'} and !$opt_in_place) { @@ -503,7 +503,7 @@ Please select a different mirror.', $doc_files_toggle_button = $fr->Button( -text => __("Toggle"), -command => sub { - toggle_and_set_opt_variable(\$vars{'option_install_docfiles'}, \$docyesno); }) + toggle_and_set_opt_variable(\$vars{'tlpdbopt_install_docfiles'}, \$docyesno); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); } @@ -516,7 +516,7 @@ Please select a different mirror.', $src_files_toggle_button = $fr->Button( -text => __("Toggle"), -command => sub { - toggle_and_set_opt_variable(\$vars{'option_install_srcfiles'}, \$srcyesno); }) + toggle_and_set_opt_variable(\$vars{'tlpdbopt_install_srcfiles'}, \$srcyesno); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); } @@ -549,7 +549,7 @@ Please select a different mirror.', -text => __("Change"), -command => sub { toggle_and_set_opt_variable( - \$vars{'option_desktop_integration'}, + \$vars{'tlpdbopt_desktop_integration'}, \$deskintyesno, \@::deskintdesc); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); @@ -562,7 +562,7 @@ Please select a different mirror.', -text => __("Change"), -command => sub { toggle_and_set_opt_variable( - \$vars{'option_file_assocs'}, \$fileassocyesno, \@::fileassocdesc); }) + \$vars{'tlpdbopt_file_assocs'}, \$fileassocyesno, \@::fileassocdesc); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); if ($::opt_all_options || admin()) { @@ -575,7 +575,7 @@ Please select a different mirror.', -text => __("Toggle"), -command => sub { toggle_and_set_opt_variable( - \$vars{'option_w32_multi_user'}, \$adminallyesno); }) + \$vars{'tlpdbopt_w32_multi_user'}, \$adminallyesno); }) ->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m"); } @@ -944,9 +944,9 @@ sub menu_select_symlink { our $osym = $vars{'instopt_path'}; our ($binlab,$binb,$manlab,$manb,$infolab,$infob); sub set_unset_buttons { - $lbin = ($osym ? $vars{'option_sys_bin'} : ''); - $linfo = ($osym ? $vars{'option_sys_info'} : ''); - $lman = ($osym ? $vars{'option_sys_man'} : ''); + $lbin = ($osym ? $vars{'tlpdbopt_sys_bin'} : ''); + $linfo = ($osym ? $vars{'tlpdbopt_sys_info'} : ''); + $lman = ($osym ? $vars{'tlpdbopt_sys_man'} : ''); if ($osym) { $binb->configure (-state => 'normal'); $manb->configure (-state => 'normal'); @@ -965,9 +965,9 @@ sub menu_select_symlink { $lbin =~ s/^~/$home/; $linfo =~ s/^~/$home/; $lman =~ s/^~/$home/; - $vars{'option_sys_bin'} = $lbin; - $vars{'option_sys_info'} = $linfo; - $vars{'option_sys_man'} = $lman; + $vars{'tlpdbopt_sys_bin'} = $lbin; + $vars{'tlpdbopt_sys_info'} = $linfo; + $vars{'tlpdbopt_sys_man'} = $lman; } $vars{'instopt_path'} = $osym; toggle_and_set_opt_variable(\$vars{'instopt_path'}, \$pathadjyesno); @@ -1152,9 +1152,9 @@ sub menu_update_texts { menu_set_binbutton_text; menu_set_schemebutton_text; $optletterstate = $::letterdesc[$vars{'instopt_letter'}]; - $optfmtstate = ($vars{'option_create_formats'} ? __("Yes") : __("No")); - $optsrcstate = ($vars{'option_install_srcfiles'} ? __("Yes") : __("No")); - $optdocstate = ($vars{'option_install_docfiles'} ? __("Yes") : __("No")); + $optfmtstate = ($vars{'tlpdbopt_create_formats'} ? __("Yes") : __("No")); + $optsrcstate = ($vars{'tlpdbopt_install_srcfiles'} ? __("Yes") : __("No")); + $optdocstate = ($vars{'tlpdbopt_install_docfiles'} ? __("Yes") : __("No")); } sub callback_select_scheme { @@ -1252,9 +1252,9 @@ sub toggle_portable { $b->configure(-state => 'disabled'); } $vars{'instopt_path'} = 0; - $vars{'option_desktop_integration'} = 0; - $vars{'option_file_assocs'} = 0; - $vars{'option_w32_multi_user'} = 0; + $vars{'tlpdbopt_desktop_integration'} = 0; + $vars{'tlpdbopt_file_assocs'} = 0; + $vars{'tlpdbopt_w32_multi_user'} = 0; $deskintyesno = __("No"); $pathadjyesno = __("No"); $fileassocyesno = __("None"); diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index 9bbf802d16a..2f6ae6d42d5 100644 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -759,24 +759,24 @@ sub help_menu { sub options_menu { my $b_path=obutton($vars{'instopt_path'}); - my $b_doc=obutton($vars{'option_install_docfiles'}); - my $b_src=obutton($vars{'option_install_srcfiles'}); - my $b_fmt=obutton($vars{'option_create_formats'}); + my $b_doc=obutton($vars{'tlpdbopt_install_docfiles'}); + my $b_src=obutton($vars{'tlpdbopt_install_srcfiles'}); + my $b_fmt=obutton($vars{'tlpdbopt_create_formats'}); my $b_letter=obutton($vars{'instopt_letter'}); my $b_adjustrepo=obutton($vars{'instopt_adjustrepo'}); my $b_deskint=obutton( - $vars{'option_desktop_integration'}, \@::deskintdesc); - my $b_admin=obutton($vars{'option_w32_multi_user'}); + $vars{'tlpdbopt_desktop_integration'}, \@::deskintdesc); + my $b_admin=obutton($vars{'tlpdbopt_w32_multi_user'}); my $b_addoneditor=obutton($vars{'collection-texworks'}); my $b_restricted=obutton($vars{'instopt_write18_restricted'}); - my $sys_bin=$vars{'option_sys_bin'}; - my $sys_man=$vars{'option_sys_man'}; - my $sys_info=$vars{'option_sys_info'}; + my $sys_bin=$vars{'tlpdbopt_sys_bin'}; + my $sys_man=$vars{'tlpdbopt_sys_man'}; + my $sys_info=$vars{'tlpdbopt_sys_info'}; - my $t_sys_bin=($vars{'instopt_path'})? $vars{'option_sys_bin'}:''; - my $t_sys_man=($vars{'instopt_path'})? $vars{'option_sys_man'}:''; - my $t_sys_info=($vars{'instopt_path'})? $vars{'option_sys_info'}:''; + my $t_sys_bin=($vars{'instopt_path'})? $vars{'tlpdbopt_sys_bin'}:''; + my $t_sys_man=($vars{'instopt_path'})? $vars{'tlpdbopt_sys_man'}:''; + my $t_sys_info=($vars{'instopt_path'})? $vars{'tlpdbopt_sys_info'}:''; my %command=( 'self' => \&options_menu, @@ -816,9 +816,9 @@ EOF } if ((win32() && !$vars{'instopt_portable'}) || $::opt_all_options) { print " <M> Start menu shortcuts / launcher: ".obutton( - $vars{'option_desktop_integration'}, \@::deskintdesc)."\n"; + $vars{'tlpdbopt_desktop_integration'}, \@::deskintdesc)."\n"; print " <N> update file associations: ".obutton( - $vars{'option_file_assocs'}, \@::fileassocdesc)."\n"; + $vars{'tlpdbopt_file_assocs'}, \@::fileassocdesc)."\n"; if ($::opt_all_options || TeXLive::TLWinGoo::admin()) { # if we are admin we allow normal user installation, too print " <U> make installation available to all users: $b_admin\n"; @@ -845,24 +845,24 @@ EOF if ($vars{'instopt_path'}) { print "New value for binary directory [$sys_bin]: "; chomp($answer=<STDIN>); - $vars{'option_sys_bin'} = "$answer" if (length $answer); - $vars{'option_sys_bin'} =~ s@\\@/@g if (win32()); - $vars{'option_sys_bin'} =~ s/^~/$home/; - if ($vars{'option_sys_bin'}=~/^(.*)\/bin$/) { - $vars{'option_sys_man'}="$1/man"; - $vars{'option_sys_info'}="$1/info"; + $vars{'tlpdbopt_sys_bin'} = "$answer" if (length $answer); + $vars{'tlpdbopt_sys_bin'} =~ s@\\@/@g if (win32()); + $vars{'tlpdbopt_sys_bin'} =~ s/^~/$home/; + if ($vars{'tlpdbopt_sys_bin'}=~/^(.*)\/bin$/) { + $vars{'tlpdbopt_sys_man'}="$1/man"; + $vars{'tlpdbopt_sys_info'}="$1/info"; } - print "New value for man directory [$vars{'option_sys_man'}]: "; + print "New value for man directory [$vars{'tlpdbopt_sys_man'}]: "; chomp($answer=<STDIN>); - $vars{'option_sys_man'}="$answer" if (length $answer); - $vars{'option_sys_man'} =~ s@\\@/@g if (win32()); - $vars{'option_sys_man'} =~ s/^~/$home/; + $vars{'tlpdbopt_sys_man'}="$answer" if (length $answer); + $vars{'tlpdbopt_sys_man'} =~ s@\\@/@g if (win32()); + $vars{'tlpdbopt_sys_man'} =~ s/^~/$home/; - print "New value for info directory [$vars{'option_sys_info'}]: "; + print "New value for info directory [$vars{'tlpdbopt_sys_info'}]: "; chomp($answer=<STDIN>); - $vars{'option_sys_info'}="$answer" if (length $answer); - $vars{'option_sys_info'} =~ s@\\@/@g if (win32()); - $vars{'option_sys_info'} =~ s/^~/$home/; + $vars{'tlpdbopt_sys_info'}="$answer" if (length $answer); + $vars{'tlpdbopt_sys_info'} =~ s@\\@/@g if (win32()); + $vars{'tlpdbopt_sys_info'} =~ s/^~/$home/; } return $command{'self'}; } @@ -876,11 +876,11 @@ EOF } } -# # option_desktop_integration, option_file_assocs +# # tlpdbopt_desktop_integration, tlpdbopt_file_assocs # # if (win32() || $::opt_all_options) { # if ("\u$answer" eq 'M' and !$vars{'instopt_portable'}) { -# toggle 'option_desktop_integration'; +# toggle 'tlpdbopt_desktop_integration'; # return $command{'self'}; # # } elsif ("\u$answer" eq 'N' and !$vars{'instopt_portable'}) { @@ -888,15 +888,15 @@ EOF # print " 0 -- don't tweak the file associations\n"; # print " 1 -- only add new file associations, don't overwrite old ones\n"; # print " 2 -- always create file associations to TeX Live programs\n"; -# print "New value for file_assocs [$vars{'option_file_assocs'}]: "; +# print "New value for file_assocs [$vars{'tlpdbopt_file_assocs'}]: "; # chomp (my $a = <STDIN>); # if ($a eq "0" || $a eq "1" || $a eq "2") { -# $vars{'option_file_assocs'} = $a; +# $vars{'tlpdbopt_file_assocs'} = $a; # } # return $command{'self'}; # # } elsif ("\u$answer" eq 'U' and !$vars{'instopt_portable'}) { -# toggle 'option_w32_multi_user'; +# toggle 'tlpdbopt_w32_multi_user'; # return $command{'self'}; # } # } @@ -904,11 +904,11 @@ EOF # other options if (("\u$answer" eq 'M') && !$vars{'instopt_portable'}) { - toggle ('option_desktop_integration', \@::deskintdesc); + toggle ('tlpdbopt_desktop_integration', \@::deskintdesc); return $command{'self'}; } elsif (("\u$answer" eq 'N') && !$vars{'instopt_portable'}) { - toggle ('option_file_assocs', \@::fileassocdesc); + toggle ('tlpdbopt_file_assocs', \@::fileassocdesc); return $command{'self'}; } elsif ("\u$answer" eq 'P') { @@ -916,7 +916,7 @@ EOF return $command{'self'}; } elsif ("\u$answer" eq 'F') { - toggle 'option_create_formats'; + toggle 'tlpdbopt_create_formats'; return $command{'self'}; } elsif ("\u$answer" eq 'E') { @@ -924,11 +924,11 @@ EOF return $command{'self'}; } elsif ("\u$answer" eq 'S' and !$opt_in_place) { - toggle 'option_install_srcfiles'; + toggle 'tlpdbopt_install_srcfiles'; return $command{'self'}; } elsif ("\u$answer" eq 'D' and !$opt_in_place) { - toggle 'option_install_docfiles'; + toggle 'tlpdbopt_install_docfiles'; return $command{'self'}; } elsif (defined $command{"\u$answer"}) { @@ -962,16 +962,16 @@ sub do_install { sub toggle_portable { if ($vars{'instopt_portable'}) { $vars{'instopt_portable'} = 0; - $vars{'option_desktop_integration'} = 0; + $vars{'tlpdbopt_desktop_integration'} = 0; $vars{'instopt_path'} = 0; - $vars{'option_file_assocs'} = 0; - $vars{'option_w32_multi_user'} = 0; + $vars{'tlpdbopt_file_assocs'} = 0; + $vars{'tlpdbopt_w32_multi_user'} = 0; } else { $vars{'instopt_portable'} = 1; - $vars{'option_desktop_integration'} = 1; + $vars{'tlpdbopt_desktop_integration'} = 1; $vars{'instopt_path'} = 1; - $vars{'option_file_assocs'} = 1; - $vars{'option_w32_multi_user'} = 1; + $vars{'tlpdbopt_file_assocs'} = 1; + $vars{'tlpdbopt_w32_multi_user'} = 1; } $portable_toggled = 1; set_texlive_default_dirs(); # this sub tests for portable and in_place @@ -988,15 +988,15 @@ sub main_menu { my $this_platform=platform_desc($vars{'this_platform'}); my $b_path=button($vars{'instopt_path'}); - my $b_doc=button($vars{'option_install_docfiles'}); - my $b_src=button($vars{'option_install_srcfiles'}); - my $b_fmt=button($vars{'option_create_formats'}); + my $b_doc=button($vars{'tlpdbopt_install_docfiles'}); + my $b_src=button($vars{'tlpdbopt_install_srcfiles'}); + my $b_fmt=button($vars{'tlpdbopt_create_formats'}); my $b_letter=button($vars{'instopt_letter'}); - my $b_deskint=button($vars{'option_desktop_integration'}, \@::deskintdesc); + my $b_deskint=button($vars{'tlpdbopt_desktop_integration'}, \@::deskintdesc); if (win32()) { - my $b_fileassoc=button($vars{'option_file_assocs'}, \@::fileassocdesc); + my $b_fileassoc=button($vars{'tlpdbopt_file_assocs'}, \@::fileassocdesc); } - my $b_admin=button($vars{'option_w32_multi_user'}); + my $b_admin=button($vars{'tlpdbopt_w32_multi_user'}); my $b_addoneditor=button($vars{'collection-texworks'}); my $b_restricted=button($vars{'instopt_write18_restricted'}); my $b_adjustrepo=button($vars{'instopt_adjustrepo'}); @@ -1106,7 +1106,7 @@ EOF if (!$vars{'instopt_portable'}) { print " $b_path adjust search path\n"; print " $b_deskint add menu items, shortcuts, etc.\n"; - print " [$vars{'option_file_assocs'}] update file associations\n"; + print " [$vars{'tlpdbopt_file_assocs'}] update file associations\n"; if (admin()) { print " $b_admin make installation available to all users\n"; } diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl index 29c588e3759..4628536c2a9 100644 --- a/Master/tlpkg/installer/install-menu-wizard.pl +++ b/Master/tlpkg/installer/install-menu-wizard.pl @@ -22,10 +22,10 @@ load_translations(); # the values are keys into the %vars array my @unix_opts = qw/instopt_letter/; my @w32_opts = qw/instopt_letter - option_desktop_integration + tlpdbopt_desktop_integration collection-texworks /; -my @w32_admin_opts = qw/option_w32_multi_user/; +my @w32_admin_opts = qw/tlpdbopt_w32_multi_user/; my @opts_list = (); if (win32()) { @@ -37,12 +37,12 @@ if (win32()) { push @opts_list, @unix_opts; } my %opts_to_str = ( - "instopt_letter" => __("Default paper size"), - "option_desktop_integration" => __("Add menu shortcuts"), - "option_file_assocs" => __("Change file associations"), - "instopt_path" => __("Adjust PATH setting in registry"), - "option_w32_multi_user" => __("Installation for all users"), - "collection-texworks" => __("Install TeXworks front end"), + "instopt_letter" => __("Default paper size"), + "tlpdbopt_desktop_integration" => __("Add menu shortcuts"), + "tlpdbopt_file_assocs" => __("Change file associations"), + "instopt_path" => __("Adjust PATH setting in registry"), + "tlpdbopt_w32_multi_user" => __("Installation for all users"), + "collection-texworks" => __("Install TeXworks front end"), ); my %opts_choices = ( "instopt_letter" => ["A4", "letter"], diff --git a/Master/tlpkg/installer/installer-options.txt b/Master/tlpkg/installer/installer-options.txt index a4c271b932f..4785804ee14 100644 --- a/Master/tlpkg/installer/installer-options.txt +++ b/Master/tlpkg/installer/installer-options.txt @@ -5,25 +5,25 @@ description used in install-tl/tlmgr/TLMedia ---------------------------------------------------------------------------- -option_install_docfiles 1 x x +tlpdbopt_install_docfiles 1 x x option("install_docfiles") install doc files install-tl: sub do_install_packages TLMedia.pm: sub install_package -option_install_srcfiles 1 x x +tlpdbopt_install_srcfiles 1 x x option("install_srcfiles") install src files install-tl: sub do_install_packages TLMedia.pm: sub install_package -option_create_formats 1 x x +tlpdbopt_create_formats 1 x x option("create_formats") create all formats install-tl: sub do_postinst_stuff tlmgr: sub handle_execute_actions -option_file_assocs 1 w32 w32 +tlpdbopt_file_assocs 1 w32 w32 option("file_assocs") file associations and file type file type is always done @@ -34,26 +34,26 @@ option_file_assocs 1 w32 w32 install-tl: sub do_tlpdb_postactions TLMedia: remove_package, install_package -option_desktop_integration 1 w32 w32 w32 +tlpdbopt_desktop_integration 1 w32 w32 w32 option("desktop_integration") shortcuts etc currently effects w32 only install-tl: sub do_tlpdb_postactions TLMedia: remove_package, install_package -option_post_code 1 +tlpdbopt_post_code 1 option("post_code") postaction code install-tl: sub do_tlpdb_postactions TLMedia: remove_package, install_package -option_sys_bin/man/info /u/l/... unix unix +tlpdbopt_sys_bin/man/info /u/l/... unix unix option("sys_bin") ... unix link dests (if instopt_path == 1) TLPDB add/remove_symlinks (via tlmgr action_symlinks and install-tl do_path_adjustments) -option_w32_multi_user 1 w32 w32 w32 +tlpdbopt_w32_multi_user 1 w32 w32 w32 option("w32_multi_user") sysadmin as multi user install-tl: sub do_path_adjustments |