summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer/install-menu-text.pl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2017-04-16 02:13:38 +0000
committerNorbert Preining <preining@logic.at>2017-04-16 02:13:38 +0000
commitf1bc728217cfe6abb4a9b2ed6d26202af0a9b01e (patch)
tree2162c45f75922002c5dc6ef9dc970c82dd67ef45 /Master/tlpkg/installer/install-menu-text.pl
parent4a0c4fb16d37da3fb452c9ea352af130944a68fa (diff)
option_path is only installer option, use instopt_path
git-svn-id: svn://tug.org/texlive/trunk@43827 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/installer/install-menu-text.pl')
-rw-r--r--Master/tlpkg/installer/install-menu-text.pl22
1 files changed, 11 insertions, 11 deletions
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index 2d73ccaa5b3..9bbf802d16a 100644
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -758,7 +758,7 @@ sub help_menu {
sub options_menu {
- my $b_path=obutton($vars{'option_path'});
+ 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'});
@@ -774,9 +774,9 @@ sub options_menu {
my $sys_man=$vars{'option_sys_man'};
my $sys_info=$vars{'option_sys_info'};
- my $t_sys_bin=($vars{'option_path'})? $vars{'option_sys_bin'}:'';
- my $t_sys_man=($vars{'option_path'})? $vars{'option_sys_man'}:'';
- my $t_sys_info=($vars{'option_path'})? $vars{'option_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 %command=(
'self' => \&options_menu,
@@ -834,15 +834,15 @@ EOF
other_options qw(R Q diskspace);
my $answer = prompt 'Enter command';
- # option_path
+ # instopt_path
if (unix()) {
if (("\u$answer" eq 'L') and !$vars{'instopt_portable'}) {
my $home = getenv('HOME');
$home = getenv('USERPROFILE') if (win32());
$home ||= '~';
- toggle 'option_path';
- if ($vars{'option_path'}) {
+ toggle 'instopt_path';
+ if ($vars{'instopt_path'}) {
print "New value for binary directory [$sys_bin]: ";
chomp($answer=<STDIN>);
$vars{'option_sys_bin'} = "$answer" if (length $answer);
@@ -871,7 +871,7 @@ EOF
my $home = getenv('HOME');
$home = getenv('USERPROFILE') if (win32());
$home ||= '~';
- toggle 'option_path';
+ toggle 'instopt_path';
return $command{'self'};
}
}
@@ -963,13 +963,13 @@ sub toggle_portable {
if ($vars{'instopt_portable'}) {
$vars{'instopt_portable'} = 0;
$vars{'option_desktop_integration'} = 0;
- $vars{'option_path'} = 0;
+ $vars{'instopt_path'} = 0;
$vars{'option_file_assocs'} = 0;
$vars{'option_w32_multi_user'} = 0;
} else {
$vars{'instopt_portable'} = 1;
$vars{'option_desktop_integration'} = 1;
- $vars{'option_path'} = 1;
+ $vars{'instopt_path'} = 1;
$vars{'option_file_assocs'} = 1;
$vars{'option_w32_multi_user'} = 1;
}
@@ -987,7 +987,7 @@ sub callback_save_profile {
sub main_menu {
my $this_platform=platform_desc($vars{'this_platform'});
- my $b_path=button($vars{'option_path'});
+ 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'});