diff options
Diffstat (limited to 'Master/tlpkg/installer/install-menu-text.pl')
-rwxr-xr-x | Master/tlpkg/installer/install-menu-text.pl | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl index 5fcaa2ecda7..7dcc2644dc8 100755 --- a/Master/tlpkg/installer/install-menu-text.pl +++ b/Master/tlpkg/installer/install-menu-text.pl @@ -694,7 +694,6 @@ sub options_menu { my $b_fmt=button($vars{'option_fmt'}); my $b_letter=button($vars{'option_letter'}); my $b_deskint=button($vars{'option_desktop_integration'}); - my $b_fileassocs=button($vars{'option_file_assocs'}); my $b_admin=button($vars{'option_w32_multi_user'}); my $b_addoneditor=button($vars{'addon_editor'}); @@ -743,7 +742,7 @@ EOF } if (win32()) { print " <M> install menu items, shortcuts, etc: $b_deskint\n"; - print " <N> update file associations: $b_fileassocs\n"; + print " <N> update file associations: [$vars{'option_file_assocs'}]\n"; if (admin()) { # if we are admin we allow normal user installation, too print " <U> make installation available to all users: $b_admin\n"; @@ -798,7 +797,15 @@ EOF return $command{'self'}; } elsif ("\u$answer" eq 'N') { - toggle 'option_file_assocs'; + print "New value for file_assocs:\n"; + 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'}]: "; + chomp (my $a = <STDIN>); + if ($a eq "0" || $a eq "1" || $a eq "2") { + $vars{'option_file_assocs'} = $a; + } return $command{'self'}; } elsif ("\u$answer" eq 'U') { @@ -864,7 +871,6 @@ sub main_menu { my $b_fmt=button($vars{'option_fmt'}); my $b_letter=button($vars{'option_letter'}); my $b_deskint=button($vars{'option_desktop_integration'}); - my $b_fileassocs=button($vars{'option_file_assocs'}); my $b_admin=button($vars{'option_w32_multi_user'}); my $b_addoneditor=button($vars{'addon_editor'}); @@ -976,7 +982,7 @@ EOF if (win32()) { print " $b_path adjust search path\n"; print " $b_deskint add menu items, shortcuts, etc.\n"; - print " $b_fileassocs update file associations\n"; + print " [$vars{'option_file_assocs'}] update file associations\n"; if (admin()) { print " $b_admin make installation available to all users\n"; } |