summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xMaster/install-tl22
-rw-r--r--Master/tlpkg/installer/install-menu-perltk.pl12
-rw-r--r--Master/tlpkg/installer/install-menu-text.pl22
-rw-r--r--Master/tlpkg/installer/install-menu-wizard.pl2
-rw-r--r--Master/tlpkg/installer/installer-options.txt4
5 files changed, 30 insertions, 32 deletions
diff --git a/Master/install-tl b/Master/install-tl
index c505da28b74..7c36957b532 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -127,7 +127,6 @@ our @collections_std;
# $tlpdb->option_XXXXX
# settings (i.e., taken from tlpkg/tlpsrc/00texlive.installation.tlpsrc
#
-# 'option_path' => 0,
# 'option_sys_bin' => '/usr/local/bin',
# 'option_sys_man' => '/usr/local/man',
# 'option_sys_info' => '/usr/local/info',
@@ -148,6 +147,7 @@ our %vars=( # 'n_' means 'number of'.
'instopt_letter' => 0,
'instopt_adjustrepo' => 1,
'instopt_write18_restricted' => 1,
+ 'instopt_path' => 0,
);
# option handling
@@ -733,6 +733,7 @@ sub final_remote_init {
}
$opt_scheme = "" if $opt_in_place;
$vars{'instopt_portable'} = $opt_portable;
+ $vars{'instopt_path'} = 1 if win32();
log("Installer revision: $::installerrevision\n");
log("Database revision: " . $tlpdb->config_revision . "\n");
@@ -770,7 +771,7 @@ sub do_installation {
$vars{'option_desktop_integration'} = 0;
$vars{'option_menu_integration'} = 0;
$vars{'option_file_assocs'} = 0;
- $vars{'option_path'} = 0;
+ $vars{'instopt_path'} = 0;
$vars{'option_w32_multi_user'} = 0;
}
if ($vars{'selected_scheme'} ne "scheme-infraonly"
@@ -1053,7 +1054,7 @@ operations might be disturbed.\n\n";
# option settings in launcher.ini
if (win32() && !$vars{'instopt_portable'}) {
- if ($vars{'option_file_assocs'} != 1 || !$vars{'option_path'}) {
+ if ($vars{'option_file_assocs'} != 1 || !$vars{'instopt_path'}) {
# create higher priority tlaunch.ini with adjusted settings
# whether or not launcher mode (desktop integration 2)
# was selected
@@ -1097,7 +1098,7 @@ operations might be disturbed.\n\n";
# for portable, this option should be unset
# it should not be necessary to test separately for portable
do_path_adjustments() if
- $vars{'option_path'} and $vars{option_desktop_integration} != 2;
+ $vars{'instopt_path'} and $vars{option_desktop_integration} != 2;
# now do the system integration:
# on unix this means setting up symlinks
@@ -1166,7 +1167,7 @@ sub rewrite_tlaunch_ini {
print OUT $ini;
print OUT "[General]";
print OUT "FILETYPES=$fts[$vars{'option_file_assocs'}]";
- print OUT "SEARCHPATH=$vars{'option_path'}\n";
+ print OUT "SEARCHPATH=$vars{'instopt_path'}\n";
close OUT;
`mktexlsr $tmfsysvar`;
} else {
@@ -1625,9 +1626,6 @@ END_EXPLICIT_MIRROR
# in portable case, shortcuts sanitized away elsewhere
$vars{'option_desktop_integration'} = $tlpdb->option("desktop_integration");
$vars{'option_desktop_integration'} = 1 if win32();
- $vars{'option_path'} = $tlpdb->option("path");
- $vars{'option_path'} = 0 if !defined($vars{'option_path'});
- $vars{'option_path'} = 1 if win32();
$vars{'option_w32_multi_user'} = $tlpdb->option("w32_multi_user");
# we have to make sure that this option is set to 0 in case
# that a non-admin is running the installations program
@@ -1837,7 +1835,7 @@ sub read_profile {
# helper subroutine to do sanity check of options before installation
sub sanitise_options {
# portable option overrides any system integration options
- $vars{'option_path'} = 0 if $vars{'instopt_portable'};
+ $vars{'instopt_path'} = 0 if $vars{'instopt_portable'};
$vars{'option_file_assocs'} = 0 if $vars{'instopt_portable'};
$vars{'option_desktop_integration'} = 0 if $vars{'instopt_portable'};
} # sanitise_options
@@ -2041,11 +2039,11 @@ sub import_settings_from_old_tlpdb {
$previoustlpdb->option_pkg("00texlive.installation",
"create_formats");
$vars{'option_desktop_integration'} = 1 if win32();
- $vars{'option_path'} =
+ $vars{'instopt_path'} =
$previoustlpdb->option_pkg("00texlive.installation",
"path");
- $vars{'option_path'} = 0 if !defined($vars{'option_path'});
- $vars{'option_path'} = 1 if win32();
+ $vars{'instopt_path'} = 0 if !defined($vars{'instopt_path'});
+ $vars{'instopt_path'} = 1 if win32();
$vars{'option_sys_bin'} =
$previoustlpdb->option_pkg("00texlive.installation",
"sys_bin");
diff --git a/Master/tlpkg/installer/install-menu-perltk.pl b/Master/tlpkg/installer/install-menu-perltk.pl
index 4bdf84bbc0a..d781fe5e9f6 100644
--- a/Master/tlpkg/installer/install-menu-perltk.pl
+++ b/Master/tlpkg/installer/install-menu-perltk.pl
@@ -132,7 +132,7 @@ sub setup_perltk_local_strings {
$fmtyesno = $::yesno[$vars{'option_create_formats'}];
$srcyesno = $::yesno[$vars{'option_install_srcfiles'}];
$deskintyesno = $::deskintdesc[$vars{'option_desktop_integration'}];
- $pathadjyesno = $::yesno[$vars{'option_path'}];
+ $pathadjyesno = $::yesno[$vars{'instopt_path'}];
$fileassocyesno = $::fileassocdesc[$vars{'option_file_assocs'}];
$editoryesno = $::yesno[$vars{'collection-texworks'}];
$adminallyesno = $::yesno[$vars{'option_w32_multi_user'}];
@@ -535,7 +535,7 @@ Please select a different mirror.',
$pathbutton = $fr->Button(
-text => __("Toggle"),
-command => sub {
- toggle_and_set_opt_variable(\$vars{'option_path'}, \$pathadjyesno); });
+ toggle_and_set_opt_variable(\$vars{'instopt_path'}, \$pathadjyesno); });
}
$pathbutton->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
@@ -941,7 +941,7 @@ sub menu_select_standard_collections {
sub menu_select_symlink {
our ($lbin,$lman,$linfo);
- our $osym = $vars{'option_path'};
+ our $osym = $vars{'instopt_path'};
our ($binlab,$binb,$manlab,$manb,$infolab,$infob);
sub set_unset_buttons {
$lbin = ($osym ? $vars{'option_sys_bin'} : '');
@@ -969,8 +969,8 @@ sub menu_select_symlink {
$vars{'option_sys_info'} = $linfo;
$vars{'option_sys_man'} = $lman;
}
- $vars{'option_path'} = $osym;
- toggle_and_set_opt_variable(\$vars{'option_path'}, \$pathadjyesno);
+ $vars{'instopt_path'} = $osym;
+ toggle_and_set_opt_variable(\$vars{'instopt_path'}, \$pathadjyesno);
}
my $sw = $mainwindow->Toplevel(
-title => __('Create symlinks in system directories'));
@@ -1251,7 +1251,7 @@ sub toggle_portable {
$tmflocalbutton, $tmfsysvarbutton, $tmfsysconfigbutton, $tmfhomebutton) {
$b->configure(-state => 'disabled');
}
- $vars{'option_path'} = 0;
+ $vars{'instopt_path'} = 0;
$vars{'option_desktop_integration'} = 0;
$vars{'option_file_assocs'} = 0;
$vars{'option_w32_multi_user'} = 0;
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'});
diff --git a/Master/tlpkg/installer/install-menu-wizard.pl b/Master/tlpkg/installer/install-menu-wizard.pl
index 6fee6de1954..29c588e3759 100644
--- a/Master/tlpkg/installer/install-menu-wizard.pl
+++ b/Master/tlpkg/installer/install-menu-wizard.pl
@@ -40,7 +40,7 @@ my %opts_to_str = (
"instopt_letter" => __("Default paper size"),
"option_desktop_integration" => __("Add menu shortcuts"),
"option_file_assocs" => __("Change file associations"),
- "option_path" => __("Adjust PATH setting in registry"),
+ "instopt_path" => __("Adjust PATH setting in registry"),
"option_w32_multi_user" => __("Installation for all users"),
"collection-texworks" => __("Install TeXworks front end"),
);
diff --git a/Master/tlpkg/installer/installer-options.txt b/Master/tlpkg/installer/installer-options.txt
index 38e606d2cdb..a4c271b932f 100644
--- a/Master/tlpkg/installer/installer-options.txt
+++ b/Master/tlpkg/installer/installer-options.txt
@@ -49,7 +49,7 @@ option_post_code 1
option_sys_bin/man/info /u/l/... unix unix
option("sys_bin") ...
- unix link dests (if option_path == 1)
+ unix link dests (if instopt_path == 1)
TLPDB add/remove_symlinks
(via tlmgr action_symlinks and install-tl do_path_adjustments)
@@ -65,7 +65,7 @@ instopt_letter 0 x x x
use letter
install-tl: sub do_postinst_stuff
-option_path 0 unix/1 win x x
+instopt_path 0 unix/1 win x x
path adjustment
not saved into the local TLPDB
only for install time setting