summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer/install-menu-text.pl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2009-07-09 11:39:06 +0000
committerNorbert Preining <preining@logic.at>2009-07-09 11:39:06 +0000
commitab471595e495323c12b4fcf31856f62269405a83 (patch)
tree4cba4dccc48f4535201066bf18c6458726d92ec7 /Master/tlpkg/installer/install-menu-text.pl
parent58b5e933d6749fd1a1c9bd27d8855a786a44b20e (diff)
allow option -all-options to show all options in text and
perltk mode, even those that are not really applicable use that option to actually show stuff in menu-text and menu-perltk show explanation strings for file assoc settings instead of number git-svn-id: svn://tug.org/texlive/trunk@14198 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-text.pl')
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl50
1 files changed, 26 insertions, 24 deletions
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index dda898c645a..7a3823831ba 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -27,7 +27,6 @@ our $MENU_QUIT = 2;
my $RETURN = $MENU_CONTINUE;
-
# issue welcome message on end of installation
push @::end_install_hook,
sub { if (win32()) { print TeXLive::TLUtils::welcome(); }
@@ -726,7 +725,7 @@ EOF
print " <S> install font/macro source tree: $b_src\n";
}
if (!$vars{'from_dvd'}) {
- if (unix()) {
+ if (unix() || $::opt_all_options) {
print <<"EOF";
<L> create symlinks in standard directories: $b_path
binaries to: $t_sys_bin
@@ -740,10 +739,10 @@ EOF
EOF
;
}
- if (win32()) {
+ if (win32() || $::opt_all_options) {
print " <M> install menu items, shortcuts, etc: $b_deskint\n";
- print " <N> update file associations: [$vars{'option_file_assocs'}]\n";
- if (admin()) {
+ print " <N> update file associations: [$::fileassocdesc[$vars{'option_file_assocs'}]]\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";
}
@@ -792,27 +791,30 @@ EOF
return $command{'self'};
}
}
- if ("\u$answer" eq 'M') {
- toggle 'option_desktop_integration';
- return $command{'self'};
+ if (win32() || $::opt_all_options) {
+ if ("\u$answer" eq 'M') {
+ toggle 'option_desktop_integration';
+ return $command{'self'};
- } elsif ("\u$answer" eq 'N') {
- 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 'N') {
+ 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') {
- toggle 'option_w32_multi_user';
- return $command{'self'};
+ } elsif ("\u$answer" eq 'U') {
+ toggle 'option_w32_multi_user';
+ return $command{'self'};
+ }
+ }
- } elsif ("\u$answer" eq 'P') {
+ if ("\u$answer" eq 'P') {
toggle 'option_letter';
return $command{'self'};
@@ -831,7 +833,7 @@ EOF
} elsif (defined $command{"\u$answer"}) {
return $command{"\u$answer"};
- } elsif (("\u$answer" eq 'E') && win32()) {
+ } elsif (("\u$answer" eq 'E') && ($::opt_all_options || win32())) {
toggle 'addon_editor';
return $command{'self'};