summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-06-13 01:14:40 +0000
committerKarl Berry <karl@freefriends.org>2022-06-13 01:14:40 +0000
commit81b57e749dca8f0eff52d587dafc271b9eeffc40 (patch)
tree8fe3f0756bd6f60206a339863c27056c32de9f97 /Master/install-tl
parent6d5127ab20c78f342a1384a57a79bf7590633dea (diff)
sort some lists; no functional changes (intended).
git-svn-id: svn://tug.org/texlive/trunk@63572 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl51
1 files changed, 24 insertions, 27 deletions
diff --git a/Master/install-tl b/Master/install-tl
index ebfd9afffd0..8718d5b5bf2 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -149,11 +149,11 @@ use TeXLive::TLUtils qw(platform platform_desc sort_archs
member process_logging_options rmtree wsystem
mkdirhier make_var_skeleton make_local_skeleton install_package copy
install_packages dirname setup_programs native_slashify forward_slashify);
-use TeXLive::TLPOBJ;
-use TeXLive::TLPDB;
use TeXLive::TLConfig;
use TeXLive::TLCrypto;
use TeXLive::TLDownload;
+use TeXLive::TLPDB;
+use TeXLive::TLPOBJ;
use TeXLive::TLPaper;
use Encode::Alias;
@@ -267,49 +267,48 @@ our %vars=( # 'n_' means 'number of'.
);
my %path_keys = (
+ 'TEXDIR' => 1,
+ 'TEXMFHOME' => 1,
'TEXMFLOCAL' => 1,
'TEXMFCONFIG' => 1,
'TEXMFSYSCONFIG' => 1,
'TEXMFVAR' => 1,
'TEXMFSYSVAR' => 1,
- 'TEXDIR' => 1,
- 'TEXMFHOME' => 1,
);
# option handling
+# tcl gui weeded out at start
my $opt_allow_ftp = 0;
+my $opt_continue = 1;
my $opt_custom_bin;
+my $opt_debug_fakenet = 0;
+my $opt_debug_setup_vars = 0;
+my $opt_font;
my $opt_force_arch;
-# tcl gui weeded out at start
my $opt_gui = "text";
my $opt_help = 0;
my $opt_init_from_profile = "";
+my $opt_installation = 1;
+my $opt_interaction = 1;
my $opt_location = "";
my $opt_no_gui = 0;
my $opt_nonadmin = 0;
+my $opt_paper = "";
my $opt_persistent_downloads = 1;
my $opt_portable = 0;
my $opt_print_arch = 0;
my $opt_profile = "";
my $opt_scheme = "";
-my $opt_version = 0;
-my $opt_warn_checksums = 1;
-my $opt_font;
-my $opt_continue = 1;
-my $opt_installation = 1;
-my $opt_interaction = 1;
-my $opt_paper = "";
my $opt_texdir = "";
my $opt_texuserdir = "";
+my $opt_version = 0;
+my $opt_warn_checksums = 1;
my %pathopts;
# unusual cases:
$::opt_select_repository = 0;
our $opt_in_place = 0;
# don't set this to a value, see below
my $opt_verify_downloads;
-# debug options
-my $opt_debug_fakenet = 0;
-my $opt_debug_setup_vars = 0;
# show all options even those not relevant for that arch
$::opt_all_options = 0;
@@ -343,10 +342,8 @@ if ((defined $ARGV[0]) && $ARGV[0] eq "-from_ext_gui") {
$from_ext_gui = 1;
# do not buffer output to the frontend
- select(STDERR);
- $| = 1;
- select(STDOUT);
- $| = 1;
+ select(STDERR); $| = 1;
+ select(STDOUT); $| = 1;
# windows: suppress console windows when invoking other programs
Win32::SetChildShowWindow(0) if win32();
@@ -379,20 +376,21 @@ GetOptions(
"all-options" => \$::opt_all_options,
"continue!" => \$opt_continue,
"custom-bin=s" => \$opt_custom_bin,
- "debug-translation" => \$::debug_translation,
"debug-fakenet" => \$opt_debug_fakenet,
"debug-setup-vars" => \$opt_debug_setup_vars,
+ "debug-translation" => \$::debug_translation,
"fancyselector",
+ "font=s" => \$opt_font,
"force-platform|force-arch=s" => \$opt_force_arch,
"gui:s" => \$opt_gui,
"in-place" => \$opt_in_place,
"init-from-profile=s" => \$opt_init_from_profile,
+ "installation!", => \$opt_installation,
+ "interaction!", => \$opt_interaction,
"lang|gui-lang=s" => \$::opt_lang,
"location|url|repository|repos|repo=s" => \$opt_location,
"no-cls", # $::opt_no_cls in install-menu-text-pl
"no-gui" => \$opt_no_gui,
- "installation!", => \$opt_installation,
- "interaction!", => \$opt_interaction,
"non-admin" => \$opt_nonadmin,
"paper=s" => \$opt_paper,
"persistent-downloads!" => \$opt_persistent_downloads,
@@ -401,6 +399,7 @@ GetOptions(
"profile=s" => \$opt_profile,
"scheme=s" => \$opt_scheme,
"select-repository" => \$::opt_select_repository,
+ "tcl", # handled by wrapper
"texdir=s" => \$opt_texdir,
"texmfconfig=s" => \$pathopts{'texmfconfig'},
"texmfhome=s" => \$pathopts{'texmfhome'},
@@ -409,8 +408,6 @@ GetOptions(
"texmfsysvar=s" => \$pathopts{'texmfsysvar'},
"texmfvar=s" => \$pathopts{'texmfvar'},
"texuserdir=s" => \$opt_texuserdir,
- "font=s" => \$opt_font,
- "tcl", # handled by wrapper
"verify-downloads!" => \$opt_verify_downloads,
"version" => \$opt_version,
"warn-checksums!" => \$opt_warn_checksums,
@@ -561,9 +558,9 @@ if (TeXLive::TLCrypto::setup_checksum_method()) {
} else {
if ($opt_warn_checksums) {
tldie(<<END_NO_CHECKSUMS);
-Warning: Cannot find a checksum implementation.
-Please install Digest::SHA (from CPAN), openssl, or sha512sum,
-or use --no-warn-checksums command line!
+$0: Quitting, cannot find a checksum implementation.
+Please install Digest::SHA (from CPAN), or openssl, or sha512sum,
+or use the --no-warn-checksums command line option.
END_NO_CHECKSUMS
}
}