texlive[43824] Master: more variable standardization for installer
commits+preining at tug.org
commits+preining at tug.org
Sun Apr 16 04:13:17 CEST 2017
Revision: 43824
http://tug.org/svn/texlive?view=revision&revision=43824
Author: preining
Date: 2017-04-16 04:13:17 +0200 (Sun, 16 Apr 2017)
Log Message:
-----------
more variable standardization for installer options
we now use instopt_ as prefix for installer only options that
are not saved into the TLPDB.
Modified Paths:
--------------
trunk/Master/install-tl
trunk/Master/tlpkg/installer/install-menu-perltk.pl
trunk/Master/tlpkg/installer/install-menu-text.pl
trunk/Master/tlpkg/installer/install-menu-wizard.pl
trunk/Master/tlpkg/installer/installer-options.txt
Modified: trunk/Master/install-tl
===================================================================
--- trunk/Master/install-tl 2017-04-16 02:13:09 UTC (rev 43823)
+++ trunk/Master/install-tl 2017-04-16 02:13:17 UTC (rev 43824)
@@ -131,10 +131,9 @@
# 'option_sys_bin' => '/usr/local/bin',
# 'option_sys_man' => '/usr/local/man',
# 'option_sys_info' => '/usr/local/info',
-# 'option_doc' => 1,
-# 'option_src' => 1,
-# 'option_fmt' => 0,
-# 'option_letter' => 0,
+# 'option_install_docfiles' => 1,
+# 'option_install_srcfiles' => 1,
+# 'option_create_formats' => 0,
our %vars=( # 'n_' means 'number of'.
'this_platform' => '',
'n_systems_available' => 0,
@@ -145,7 +144,9 @@
'src_splitting_supported' => 1,
'doc_splitting_supported' => 1,
'selected_scheme' => $default_scheme,
- 'portable' => 0,
+ 'instopt_portable' => 0,
+ 'instopt_letter' => 0,
+ 'instopt_adjustrepo' => 1,
);
# option handling
@@ -730,7 +731,7 @@
$opt_in_place = 0;
}
$opt_scheme = "" if $opt_in_place;
- $vars{'portable'} = $opt_portable;
+ $vars{'instopt_portable'} = $opt_portable;
log("Installer revision: $::installerrevision\n");
log("Database revision: " . $tlpdb->config_revision . "\n");
@@ -764,7 +765,7 @@
if (win32()) {
non_admin() if !$vars{'option_w32_multi_user'};
}
- if ($vars{'portable'}) {
+ if ($vars{'instopt_portable'}) {
$vars{'option_desktop_integration'} = 0;
$vars{'option_menu_integration'} = 0;
$vars{'option_file_assocs'} = 0;
@@ -1041,7 +1042,7 @@
# now work through the options if specified at all
# letter instead of a4
- if ($vars{'option_letter'}) {
+ if ($vars{'instopt_letter'}) {
# set paper size, but do not execute any post actions, which in this
# case would be mktexlsr and fmtutil-sys -all; clearly premature
# here in the installer.
@@ -1050,7 +1051,7 @@
}
# option settings in launcher.ini
- if (win32() && !$vars{'portable'}) {
+ if (win32() && !$vars{'instopt_portable'}) {
if ($vars{'option_file_assocs'} != 1 || !$vars{'option_path'}) {
# create higher priority tlaunch.ini with adjusted settings
# whether or not launcher mode (desktop integration 2)
@@ -1062,7 +1063,7 @@
# now rerun mktexlsr for updmap-sys and tlmgr paper letter updates.
$errcount += wsystem("re-running", "mktexlsr", $TEXMFSYSVAR,$TEXMFSYSCONFIG);
- if (win32() and !$vars{'portable'} and !$opt_in_place) {
+ if (win32() and !$vars{'instopt_portable'} and !$opt_in_place) {
if ($vars{'option_desktop_integration'} != 2) {
create_uninstaller($vars{'TEXDIR'});
} else {
@@ -1080,7 +1081,7 @@
}
# all formats option
- if ($vars{'option_fmt'}) {
+ if ($vars{'option_create_formats'}) {
if (-x "$plat_bindir/fmtutil-sys$progext") {
info("pre-generating all format files, be patient...\n");
$errcount += run_postinst_cmd(
@@ -1242,7 +1243,7 @@
}
}
- if ($vars{'portable'}) {
+ if ($vars{'instopt_portable'}) {
push @changedtmf, "ASYMPTOTE_HOME = \$TEXMFCONFIG/asymptote\n";
}
@@ -1286,7 +1287,7 @@
# to its version if available and 0 otherwise.
if (win32) {
my $use_ext = 0;
- if (!$vars{'portable'} &&
+ if (!$vars{'instopt_portable'} &&
defined $ENV{'extperl'} && $ENV{'extperl'} =~ /^(\d+\.\d+)/) {
$use_ext = 1 if $1 >= 5.14;
}
@@ -1393,7 +1394,7 @@
$tex_prefix ||= '/usr/local/texlive';
}
# for portable and in_place installation we want everything in one directory
- $vars{'TEXDIR'} = ($vars{'portable'} || $opt_in_place)
+ $vars{'TEXDIR'} = ($vars{'instopt_portable'} || $opt_in_place)
? $tex_prefix : "$tex_prefix/$texlive_release";
my $texmfsysvar = getenv('TEXLIVE_INSTALL_TEXMFSYSVAR');
@@ -1426,7 +1427,7 @@
$vars{'TEXMFCONFIG'} = $texmfconfig;
# for portable installation we want everything in one directory
- if ($vars{'portable'}) {
+ if ($vars{'instopt_portable'}) {
$vars{'TEXMFHOME'} = "\$TEXMFLOCAL";
$vars{'TEXMFVAR'} = "\$TEXMFSYSVAR";
$vars{'TEXMFCONFIG'} = "\$TEXMFSYSCONFIG";
@@ -1550,8 +1551,8 @@
$install{$p} = 0;
next;
}
- $size+=$tlpobj->docsize if $vars{'option_doc'};
- $size+=$tlpobj->srcsize if $vars{'option_src'};
+ $size+=$tlpobj->docsize if $vars{'option_install_docfiles'};
+ $size+=$tlpobj->srcsize if $vars{'option_install_srcfiles'};
$size+=$tlpobj->runsize;
foreach $a (@archs) {
$size += $tlpobj->binsize->{$a} if defined($tlpobj->binsize->{$a});
@@ -1610,12 +1611,12 @@
if $do_die;
}
# set the defaults to what is specified in the tlpdb
- $vars{'option_doc'} = $tlpdb->option("install_docfiles");
- $vars{'option_src'} = $tlpdb->option("install_srcfiles");
- $vars{'option_fmt'} = $tlpdb->option("create_formats");
+ $vars{'option_install_docfiles'} = $tlpdb->option("install_docfiles");
+ $vars{'option_install_srcfiles'} = $tlpdb->option("install_srcfiles");
+ $vars{'option_create_formats'} = $tlpdb->option("create_formats");
$vars{'option_autobackup'} = $tlpdb->option("autobackup");
$vars{'option_backupdir'} = $tlpdb->option("backupdir");
- $vars{'option_letter'} = defined($tlpdb->option("paper"))
+ $vars{'instopt_letter'} = defined($tlpdb->option("paper"))
&& ($tlpdb->option("paper") eq "letter" ? 1 : 0);
# below, we really mean (start) menu integration.
# 2016: always menu shortcuts, never desktop shortcuts, whatever the setting
@@ -1764,7 +1765,7 @@
print $fh "$key $vars{$key}\n" if $key =~ /^TEXMFCONFIG/;
print $fh "$key $vars{$key}\n" if $key =~ /^TEXMFLOCAL/;
print $fh "$key $vars{$key}\n" if $key =~ /^TEXMFHOME/;
- print $fh "$key $vars{$key}\n" if $key =~ /^portable/;
+ print $fh "$key $vars{$key}\n" if $key =~ /^instopt_portable/;
}
if (!ref($profilepath)) {
close PROFILE;
@@ -1814,9 +1815,9 @@
# 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{'portable'};
- $vars{'option_file_assocs'} = 0 if $vars{'portable'};
- $vars{'option_desktop_integration'} = 0 if $vars{'portable'};
+ $vars{'option_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
sub do_install_packages {
@@ -1832,7 +1833,7 @@
$localtlpdb->option ("file_assocs", "0");
$localtlpdb->option ("post_code", "0");
if (!install_packages($tlpdb,$media,$localtlpdb,\@what,
- $vars{'option_src'},$vars{'option_doc'})) {
+ $vars{'option_install_srcfiles'},$vars{'option_install_docfiles'})) {
my $profile_name = "installation.profile";
create_profile($profile_name);
tlwarn("Installation failed.\n");
@@ -1863,7 +1864,7 @@
# if we are told to adjust the repository *and* we are *not*
# installing from the network already, we adjust the repository
# to the default mirror.ctan.org
- if ($vars{'adjustrepo'} && ($media ne 'NET')) {
+ if ($vars{'instopt_adjustrepo'} && ($media ne 'NET')) {
$localtlpdb->option ("location", $TeXLiveURL);
} else {
my $final_loc = ($media eq 'NET' ? $location : abs_path($location));
@@ -1871,7 +1872,7 @@
}
$localtlpdb->option ("autobackup", $vars{'option_autobackup'});
$localtlpdb->option ("backupdir", $vars{'option_backupdir'});
- $localtlpdb->option ("create_formats", $vars{'option_fmt'} ? "1" : "0");
+ $localtlpdb->option ("create_formats", $vars{'option_create_formats'} ? "1" : "0");
$localtlpdb->option (
"desktop_integration", $vars{'option_desktop_integration'});
$localtlpdb->option ("file_assocs", $vars{'option_file_assocs'});
@@ -1879,8 +1880,8 @@
$localtlpdb->option ("sys_bin", $vars{'option_sys_bin'});
$localtlpdb->option ("sys_info", $vars{'option_sys_info'});
$localtlpdb->option ("sys_man", $vars{'option_sys_man'});
- $localtlpdb->option ("install_docfiles", $vars{'option_doc'} ? "1" : "0");
- $localtlpdb->option ("install_srcfiles", $vars{'option_src'} ? "1" : "0");
+ $localtlpdb->option ("install_docfiles", $vars{'option_install_docfiles'} ? "1" : "0");
+ $localtlpdb->option ("install_srcfiles", $vars{'option_install_srcfiles'} ? "1" : "0");
$localtlpdb->option (
"w32_multi_user", $vars{'option_w32_multi_user'} ? "1" : "0");
my @archs;
@@ -2008,13 +2009,13 @@
#
# now for the settings
# set the defaults to what is specified in the tlpdb
- $vars{'option_doc'} =
+ $vars{'option_install_docfiles'} =
$previoustlpdb->option_pkg("00texlive.installation",
"install_docfiles");
- $vars{'option_src'} =
+ $vars{'option_install_srcfiles'} =
$previoustlpdb->option_pkg("00texlive.installation",
"install_srcfiles");
- $vars{'option_fmt'} =
+ $vars{'option_create_formats'} =
$previoustlpdb->option_pkg("00texlive.installation",
"create_formats");
$vars{'option_desktop_integration'} = 1 if win32();
@@ -2079,7 +2080,7 @@
tlwarn("You will need to select your preferred paper sizes manually.\n\n");
} else {
if ($common_paper eq "letter") {
- $vars{'option_letter'} = 1;
+ $vars{'instopt_letter'} = 1;
} elsif ($common_paper eq "a4") {
# do nothing
} else {
Modified: trunk/Master/tlpkg/installer/install-menu-perltk.pl
===================================================================
--- trunk/Master/tlpkg/installer/install-menu-perltk.pl 2017-04-16 02:13:09 UTC (rev 43823)
+++ trunk/Master/tlpkg/installer/install-menu-perltk.pl 2017-04-16 02:13:17 UTC (rev 43824)
@@ -127,18 +127,18 @@
# ##################################################################
sub setup_perltk_local_strings {
- $portableyesno = $::yesno[$vars{'portable'}];
- $letteryesno = $::letterdesc[$vars{'option_letter'}];
- $fmtyesno = $::yesno[$vars{'option_fmt'}];
- $srcyesno = $::yesno[$vars{'option_src'}];
+ $portableyesno = $::yesno[$vars{'instopt_portable'}];
+ $letteryesno = $::letterdesc[$vars{'instopt_letter'}];
+ $fmtyesno = $::yesno[$vars{'option_create_formats'}];
+ $srcyesno = $::yesno[$vars{'option_install_srcfiles'}];
$deskintyesno = $::deskintdesc[$vars{'option_desktop_integration'}];
$pathadjyesno = $::yesno[$vars{'option_path'}];
$fileassocyesno = $::fileassocdesc[$vars{'option_file_assocs'}];
$editoryesno = $::yesno[$vars{'collection-texworks'}];
$adminallyesno = $::yesno[$vars{'option_w32_multi_user'}];
- $docyesno = $::yesno[$vars{'option_doc'}];
+ $docyesno = $::yesno[$vars{'option_install_docfiles'}];
$restrictedyesno = $::yesno[$vars{'option_write18_restricted'}];
- $adjustrepoyesno = $::yesno[$vars{'adjustrepo'}];
+ $adjustrepoyesno = $::yesno[$vars{'instopt_adjustrepo'}];
}
sub menu_abort {
@@ -442,7 +442,7 @@
-command => sub { menu_edit_vars_value("TEXMFHOME"); })
->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
- if ($vars{'portable'}) {
+ if ($vars{'instopt_portable'}) {
for my $b (
$tmflocalbutton, $tmfsysvarbutton, $tmfsysconfigbutton, $tmfhomebutton) {
$b->configure(-state => 'disabled')
@@ -464,7 +464,7 @@
-text => __("Toggle"),
-command => sub {
toggle_and_set_opt_variable(
- \$vars{'option_letter'}, \$letteryesno, \@::letterdesc); })
+ \$vars{'instopt_letter'}, \$letteryesno, \@::letterdesc); })
->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
$row++;
@@ -491,7 +491,7 @@
$format_toggle_button = $fr->Button(
-text => __("Toggle"),
-command => sub {
- toggle_and_set_opt_variable(\$vars{'option_fmt'}, \$fmtyesno); })
+ toggle_and_set_opt_variable(\$vars{'option_create_formats'}, \$fmtyesno); })
->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
if ($vars{'doc_splitting_supported'} and !$opt_in_place) {
@@ -503,7 +503,7 @@
$doc_files_toggle_button = $fr->Button(
-text => __("Toggle"),
-command => sub {
- toggle_and_set_opt_variable(\$vars{'option_doc'}, \$docyesno); })
+ toggle_and_set_opt_variable(\$vars{'option_install_docfiles'}, \$docyesno); })
->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
}
@@ -516,7 +516,7 @@
$src_files_toggle_button = $fr->Button(
-text => __("Toggle"),
-command => sub {
- toggle_and_set_opt_variable(\$vars{'option_src'}, \$srcyesno); })
+ toggle_and_set_opt_variable(\$vars{'option_install_srcfiles'}, \$srcyesno); })
->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
}
@@ -605,11 +605,11 @@
-text => __("Toggle"),
-command => sub {
toggle_and_set_opt_variable(
- \$vars{'adjustrepo'}, \$adjustrepoyesno); })
+ \$vars{'instopt_adjustrepo'}, \$adjustrepoyesno); })
->grid(-row => $row, -column => 3, -sticky => "ew", -padx => "2m");
}
- if ($vars{'portable'}) {
+ if ($vars{'instopt_portable'}) {
for $b ($pathbutton, $deskintbutton, $assocbutton, $adminbutton) {
$b->configure(-state => 'disabled') if $b;
}
@@ -1151,10 +1151,10 @@
menu_set_collections_text;
menu_set_binbutton_text;
menu_set_schemebutton_text;
- $optletterstate = $::letterdesc[$vars{'option_letter'}];
- $optfmtstate = ($vars{'option_fmt'} ? __("Yes") : __("No"));
- $optsrcstate = ($vars{'option_src'} ? __("Yes") : __("No"));
- $optdocstate = ($vars{'option_doc'} ? __("Yes") : __("No"));
+ $optletterstate = $::letterdesc[$vars{'instopt_letter'}];
+ $optfmtstate = ($vars{'option_create_formats'} ? __("Yes") : __("No"));
+ $optsrcstate = ($vars{'option_install_srcfiles'} ? __("Yes") : __("No"));
+ $optdocstate = ($vars{'option_install_docfiles'} ? __("Yes") : __("No"));
}
sub callback_select_scheme {
@@ -1232,8 +1232,8 @@
sub toggle_portable {
my $td = $vars{'TEXDIR'};
my $b;
- if ($vars{'portable'}) {
- $vars{'portable'} = 0;
+ if ($vars{'instopt_portable'}) {
+ $vars{'instopt_portable'} = 0;
$portableyesno = __('No');
# enable some buttons
for $b (
@@ -1244,7 +1244,7 @@
$b->configure(-state => 'normal') if $b;
}
} else {
- $vars{'portable'} = 1;
+ $vars{'instopt_portable'} = 1;
$portableyesno = __('Yes');
# disable some buttons. These should get a name first.
for $b (
Modified: trunk/Master/tlpkg/installer/install-menu-text.pl
===================================================================
--- trunk/Master/tlpkg/installer/install-menu-text.pl 2017-04-16 02:13:09 UTC (rev 43823)
+++ trunk/Master/tlpkg/installer/install-menu-text.pl 2017-04-16 02:13:17 UTC (rev 43824)
@@ -99,7 +99,7 @@
'Q' => 'quit'
);
- $opts{'I'}=$vars{'portable'} ? 'start portable installation' :
+ $opts{'I'}=$vars{'instopt_portable'} ? 'start portable installation' :
'start installation to hard disk';
print "\nActions:";
@@ -520,7 +520,7 @@
support tree: $texmfdir
EOF
}
- if (!$vars{'portable'}) {
+ if (!$vars{'instopt_portable'}) {
print <<"EOF";
<2> TEXMFLOCAL: $vars{'TEXMFLOCAL'}
@@ -562,37 +562,37 @@
}
return $command{'self'};
- } elsif ("\u$answer" eq '2' and !$vars{'portable'}) {
+ } elsif ("\u$answer" eq '2' and !$vars{'instopt_portable'}) {
print "New value for TEXMFLOCAL [$vars{'TEXMFLOCAL'}]: ";
$answer = &input_dirname ();
$vars{'TEXMFLOCAL'} = $answer if $answer ne "";
return $command{'self'};
- } elsif ("\u$answer" eq '3' and !$vars{'portable'}) {
+ } elsif ("\u$answer" eq '3' and !$vars{'instopt_portable'}) {
print "New value for TEXMFSYSVAR [$vars{'TEXMFSYSVAR'}]: ";
$answer = &input_dirname ();
$vars{'TEXMFSYSVAR'} = $answer if $answer ne "";
return $command{'self'};
- } elsif ("\u$answer" eq '4' and !$vars{'portable'}) {
+ } elsif ("\u$answer" eq '4' and !$vars{'instopt_portable'}) {
print "New value for TEXMFSYSCONFIG [$vars{'TEXMFSYSCONFIG'}]: ";
$answer = &input_dirname ();
$vars{'TEXMFSYSCONFIG'} = $answer if $answer ne "";
return $command{'self'};
- } elsif ("\u$answer" eq '5' and !$vars{'portable'}) {
+ } elsif ("\u$answer" eq '5' and !$vars{'instopt_portable'}) {
print "New value for TEXMFVAR [$vars{'TEXMFVAR'}]: ";
$answer = &input_dirname ("noexpansion");
$vars{'TEXMFVAR'} = $answer if $answer ne "";
return $command{'self'};
- } elsif ("\u$answer" eq '6' and !$vars{'portable'}) {
+ } elsif ("\u$answer" eq '6' and !$vars{'instopt_portable'}) {
print "New value for TEXMFCONFIG [$vars{'TEXMFCONFIG'}]: ";
$answer = &input_dirname ("noexpansion");
$vars{'TEXMFCONFIG'} = $answer if $answer ne "";
return $command{'self'};
- } elsif ("\u$answer" eq '7' and !$vars{'portable'}) {
+ } elsif ("\u$answer" eq '7' and !$vars{'instopt_portable'}) {
print "New value for TEXMFHOME [$vars{'TEXMFHOME'}]: ";
$answer = &input_dirname ("noexpansion");
$vars{'TEXMFHOME'} = $answer if $answer ne "";
@@ -759,11 +759,11 @@
sub options_menu {
my $b_path=obutton($vars{'option_path'});
- my $b_doc=obutton($vars{'option_doc'});
- my $b_src=obutton($vars{'option_src'});
- my $b_fmt=obutton($vars{'option_fmt'});
- my $b_letter=obutton($vars{'option_letter'});
- my $b_adjustrepo=obutton($vars{'adjustrepo'});
+ 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_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'});
@@ -799,7 +799,7 @@
if ($vars{'src_splitting_supported'} and !$opt_in_place) {
print " <S> install font/macro source tree: $b_src\n";
}
- if (!$vars{'portable'}) {
+ if (!$vars{'instopt_portable'}) {
if (unix() || $::opt_all_options) {
print <<"EOF";
<L> create symlinks in standard directories: $b_path
@@ -814,7 +814,7 @@
EOF
;
}
- if ((win32() && !$vars{'portable'}) || $::opt_all_options) {
+ if ((win32() && !$vars{'instopt_portable'}) || $::opt_all_options) {
print " <M> Start menu shortcuts / launcher: ".obutton(
$vars{'option_desktop_integration'}, \@::deskintdesc)."\n";
print " <N> update file associations: ".obutton(
@@ -837,7 +837,7 @@
# option_path
if (unix()) {
- if (("\u$answer" eq 'L') and !$vars{'portable'}) {
+ if (("\u$answer" eq 'L') and !$vars{'instopt_portable'}) {
my $home = getenv('HOME');
$home = getenv('USERPROFILE') if (win32());
$home ||= '~';
@@ -867,7 +867,7 @@
return $command{'self'};
}
} else {
- if (("\u$answer" eq 'L') and !$vars{'portable'}) {
+ if (("\u$answer" eq 'L') and !$vars{'instopt_portable'}) {
my $home = getenv('HOME');
$home = getenv('USERPROFILE') if (win32());
$home ||= '~';
@@ -879,11 +879,11 @@
# # option_desktop_integration, option_file_assocs
#
# if (win32() || $::opt_all_options) {
-# if ("\u$answer" eq 'M' and !$vars{'portable'}) {
+# if ("\u$answer" eq 'M' and !$vars{'instopt_portable'}) {
# toggle 'option_desktop_integration';
# return $command{'self'};
#
-# } elsif ("\u$answer" eq 'N' and !$vars{'portable'}) {
+# } elsif ("\u$answer" eq 'N' and !$vars{'instopt_portable'}) {
# 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";
@@ -895,7 +895,7 @@
# }
# return $command{'self'};
#
-# } elsif ("\u$answer" eq 'U' and !$vars{'portable'}) {
+# } elsif ("\u$answer" eq 'U' and !$vars{'instopt_portable'}) {
# toggle 'option_w32_multi_user';
# return $command{'self'};
# }
@@ -903,20 +903,20 @@
# other options
- if (("\u$answer" eq 'M') && !$vars{'portable'}) {
+ if (("\u$answer" eq 'M') && !$vars{'instopt_portable'}) {
toggle ('option_desktop_integration', \@::deskintdesc);
return $command{'self'};
- } elsif (("\u$answer" eq 'N') && !$vars{'portable'}) {
+ } elsif (("\u$answer" eq 'N') && !$vars{'instopt_portable'}) {
toggle ('option_file_assocs', \@::fileassocdesc);
return $command{'self'};
} elsif ("\u$answer" eq 'P') {
- toggle 'option_letter';
+ toggle 'instopt_letter';
return $command{'self'};
} elsif ("\u$answer" eq 'F') {
- toggle 'option_fmt';
+ toggle 'option_create_formats';
return $command{'self'};
} elsif ("\u$answer" eq 'E') {
@@ -924,11 +924,11 @@
return $command{'self'};
} elsif ("\u$answer" eq 'S' and !$opt_in_place) {
- toggle 'option_src';
+ toggle 'option_install_srcfiles';
return $command{'self'};
} elsif ("\u$answer" eq 'D' and !$opt_in_place) {
- toggle 'option_doc';
+ toggle 'option_install_docfiles';
return $command{'self'};
} elsif (defined $command{"\u$answer"}) {
@@ -940,7 +940,7 @@
return $command{'self'};
} elsif ("\u$answer" eq 'Y' and $media ne "NET") {
- toggle 'adjustrepo';
+ toggle 'instopt_adjustrepo';
return $command{'self'};
} else {
@@ -960,14 +960,14 @@
}
sub toggle_portable {
- if ($vars{'portable'}) {
- $vars{'portable'} = 0;
+ if ($vars{'instopt_portable'}) {
+ $vars{'instopt_portable'} = 0;
$vars{'option_desktop_integration'} = 0;
$vars{'option_path'} = 0;
$vars{'option_file_assocs'} = 0;
$vars{'option_w32_multi_user'} = 0;
} else {
- $vars{'portable'} = 1;
+ $vars{'instopt_portable'} = 1;
$vars{'option_desktop_integration'} = 1;
$vars{'option_path'} = 1;
$vars{'option_file_assocs'} = 1;
@@ -988,10 +988,10 @@
my $this_platform=platform_desc($vars{'this_platform'});
my $b_path=button($vars{'option_path'});
- my $b_doc=button($vars{'option_doc'});
- my $b_src=button($vars{'option_src'});
- my $b_fmt=button($vars{'option_fmt'});
- my $b_letter=button($vars{'option_letter'});
+ 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_letter=button($vars{'instopt_letter'});
my $b_deskint=button($vars{'option_desktop_integration'}, \@::deskintdesc);
if (win32()) {
my $b_fileassoc=button($vars{'option_file_assocs'}, \@::fileassocdesc);
@@ -999,7 +999,7 @@
my $b_admin=button($vars{'option_w32_multi_user'});
my $b_addoneditor=button($vars{'collection-texworks'});
my $b_restricted=button($vars{'option_write18_restricted'});
- my $b_adjustrepo=button($vars{'adjustrepo'});
+ my $b_adjustrepo=button($vars{'instopt_adjustrepo'});
my $warn_nobin;
@@ -1103,7 +1103,7 @@
}
}
if (win32()) {
- if (!$vars{'portable'}) {
+ 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";
@@ -1115,13 +1115,13 @@
}
print " $b_path create symlinks to standard directories\n"
- unless ($vars{'portable'} || win32());
+ unless ($vars{'instopt_portable'} || win32());
print " $b_adjustrepo after install, use tlnet on CTAN "
. "for package updates\n"
unless ($media eq 'NET');
- if ($vars{'portable'}) {
+ if ($vars{'instopt_portable'}) {
print "\n <V> set up for regular installation to hard disk\n";
} else {
print "\n <V> set up for portable installation\n";
Modified: trunk/Master/tlpkg/installer/install-menu-wizard.pl
===================================================================
--- trunk/Master/tlpkg/installer/install-menu-wizard.pl 2017-04-16 02:13:09 UTC (rev 43823)
+++ trunk/Master/tlpkg/installer/install-menu-wizard.pl 2017-04-16 02:13:17 UTC (rev 43824)
@@ -20,8 +20,8 @@
# for unix and windows. On W32 with admin privileges both @w32 list options
# are shown
# the values are keys into the %vars array
-my @unix_opts = qw/option_letter/;
-my @w32_opts = qw/option_letter
+my @unix_opts = qw/instopt_letter/;
+my @w32_opts = qw/instopt_letter
option_desktop_integration
collection-texworks
/;
@@ -37,7 +37,7 @@
push @opts_list, @unix_opts;
}
my %opts_to_str = (
- "option_letter" => __("Default paper size"),
+ "instopt_letter" => __("Default paper size"),
"option_desktop_integration" => __("Add menu shortcuts"),
"option_file_assocs" => __("Change file associations"),
"option_path" => __("Adjust PATH setting in registry"),
@@ -45,7 +45,7 @@
"collection-texworks" => __("Install TeXworks front end"),
);
my %opts_choices = (
- "option_letter" => ["A4", "letter"],
+ "instopt_letter" => ["A4", "letter"],
);
Modified: trunk/Master/tlpkg/installer/installer-options.txt
===================================================================
--- trunk/Master/tlpkg/installer/installer-options.txt 2017-04-16 02:13:09 UTC (rev 43823)
+++ trunk/Master/tlpkg/installer/installer-options.txt 2017-04-16 02:13:17 UTC (rev 43824)
@@ -5,19 +5,19 @@
description
used in install-tl/tlmgr/TLMedia
----------------------------------------------------------------------------
-option_doc 1 x x
+option_install_docfiles 1 x x
option("install_docfiles")
install doc files
install-tl: sub do_install_packages
TLMedia.pm: sub install_package
-option_src 1 x x
+option_install_srcfiles 1 x x
option("install_srcfiles")
install src files
install-tl: sub do_install_packages
TLMedia.pm: sub install_package
-option_fmt 1 x x
+option_create_formats 1 x x
option("create_formats")
create all formats
install-tl: sub do_postinst_stuff
@@ -59,7 +59,7 @@
install-tl: sub do_path_adjustments
TLMedia: remove_package, install_package
-option_letter 0 x x x
+instopt_letter 0 x x x
not saved into the local TLPDB
only for install time setting
use letter
More information about the tex-live-commits
mailing list