summaryrefslogtreecommitdiff
path: root/Master/tlpkg/installer/install-menu-text.pl
diff options
context:
space:
mode:
Diffstat (limited to 'Master/tlpkg/installer/install-menu-text.pl')
-rwxr-xr-xMaster/tlpkg/installer/install-menu-text.pl40
1 files changed, 20 insertions, 20 deletions
diff --git a/Master/tlpkg/installer/install-menu-text.pl b/Master/tlpkg/installer/install-menu-text.pl
index d9871ed9e4e..5fcaa2ecda7 100755
--- a/Master/tlpkg/installer/install-menu-text.pl
+++ b/Master/tlpkg/installer/install-menu-text.pl
@@ -698,13 +698,13 @@ sub options_menu {
my $b_admin=button($vars{'option_w32_multi_user'});
my $b_addoneditor=button($vars{'addon_editor'});
- my $sys_bin=$vars{'sys_bin'};
- my $sys_man=$vars{'sys_man'};
- my $sys_info=$vars{'sys_info'};
+ my $sys_bin=$vars{'option_sys_bin'};
+ my $sys_man=$vars{'option_sys_man'};
+ my $sys_info=$vars{'option_sys_info'};
- my $t_sys_bin=($vars{'option_path'})? $vars{'sys_bin'}:'';
- my $t_sys_man=($vars{'option_path'})? $vars{'sys_man'}:'';
- my $t_sys_info=($vars{'option_path'})? $vars{'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 %command=(
'self' => \&options_menu,
@@ -763,24 +763,24 @@ EOF
if ($vars{'option_path'}) {
print "New value for binary directory [$sys_bin]: ";
chomp($answer=<STDIN>);
- $vars{'sys_bin'} = "$answer" if (length $answer);
- $vars{'sys_bin'} =~ s@\\@/@g if (win32());
- $vars{'sys_bin'} =~ s/^~/$home/;
- if ($vars{'sys_bin'}=~/^(.*)\/bin$/) {
- $vars{'sys_man'}="$1/man";
- $vars{'sys_info'}="$1/info";
+ $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";
}
- print "New value for man directory [$vars{'sys_man'}]: ";
+ print "New value for man directory [$vars{'option_sys_man'}]: ";
chomp($answer=<STDIN>);
- $vars{'sys_man'}="$answer" if (length $answer);
- $vars{'sys_man'} =~ s@\\@/@g if (win32());
- $vars{'sys_man'} =~ s/^~/$home/;
+ $vars{'option_sys_man'}="$answer" if (length $answer);
+ $vars{'option_sys_man'} =~ s@\\@/@g if (win32());
+ $vars{'option_sys_man'} =~ s/^~/$home/;
- print "New value for info directory [$vars{'sys_info'}]: ";
+ print "New value for info directory [$vars{'option_sys_info'}]: ";
chomp($answer=<STDIN>);
- $vars{'sys_info'}="$answer" if (length $answer);
- $vars{'sys_info'} =~ s@\\@/@g if (win32());
- $vars{'sys_info'} =~ s/^~/$home/;
+ $vars{'option_sys_info'}="$answer" if (length $answer);
+ $vars{'option_sys_info'} =~ s@\\@/@g if (win32());
+ $vars{'option_sys_info'} =~ s/^~/$home/;
}
return $command{'self'};
}