summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer/install-menu-text.pl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-04-16 02:14:07 +0000
committerNorbert Preining <preining@logic.at>2017-04-16 02:14:07 +0000
commitefbb8161f75b4b347656e7fd5f621960b3c3e0aa (patch)
tree412de0712166afef8678b3d4fa6618e878844c58 /Master/tlpkg/installer/install-menu-text.pl
parent5913c85040504aee4109a34aaad42020b7feff38 (diff)
use tlpdbopt_ instead of option_
git-svn-id: svn://tug.org/texlive/trunk@43831 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-text.pl')
-rw-r--r--Master/tlpkg/installer/install-menu-text.pl100
1 files changed, 50 insertions, 50 deletions
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";
}