summaryrefslogtreecommitdiff
path: root/Master/install-tl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2016-04-12 07:40:24 +0000
committerNorbert Preining <preining@logic.at>2016-04-12 07:40:24 +0000
commit7014f2dec7f957c05d060222640c63bb5be791ec (patch)
treecc72b1d38848dc3af251217fbf48c8b1e067ed39 /Master/install-tl
parentf7f42f89567e47d6fb3c4ad01327d42006e1c4eb (diff)
install-tl: verify downloads, allow for --no-verify-downloads
git-svn-id: svn://tug.org/texlive/trunk@40468 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl')
-rwxr-xr-xMaster/install-tl22
1 files changed, 16 insertions, 6 deletions
diff --git a/Master/install-tl b/Master/install-tl
index 48a258e4ac7..238919c9e99 100755
--- a/Master/install-tl
+++ b/Master/install-tl
@@ -167,6 +167,7 @@ my $opt_version = 0;
my $opt_force_arch;
my $opt_persistent_downloads = 1;
my $opt_allow_ftp = 0;
+my $opt_verify_downloads = 1;
$::opt_select_repository = 0;
# show all options even those not relevant for that arch
@@ -223,6 +224,7 @@ GetOptions(
"all-options" => \$::opt_all_options,
"persistent-downloads!" => \$opt_persistent_downloads,
"select-repository" => \$::opt_select_repository,
+ "verify-downloads!" => \$opt_verify_downloads,
"version" => \$opt_version,
"help|?" => \$opt_help) or pod2usage(1);
@@ -340,10 +342,12 @@ if ($opt_print_arch) {
}
# try to setup gpg
-if (TeXLive::TLUtils::setup_gpg($::installerdir)) {
- log("Trying to verify cryptographic signatures!\n")
-} else {
- tlwarn("Setting up gpg did not succeed!\n");
+if ($opt_verify_downloads) {
+ if (TeXLive::TLUtils::setup_gpg($::installerdir)) {
+ log("Trying to verify cryptographic signatures!\n")
+ } else {
+ tlwarn("Setting up gpg did not succeed!\n");
+ }
}
@@ -1411,7 +1415,7 @@ sub calc_depends {
sub load_tlpdb {
my $master = $location;
info("Loading $master/$TeXLive::TLConfig::InfraLocation/$TeXLive::TLConfig::DatabaseName\n");
- $tlpdb = TeXLive::TLPDB->new(root => $master);
+ $tlpdb = TeXLive::TLPDB->new(root => $master, 'verify' => $opt_verify_downloads);
if (!defined($tlpdb)) {
my $do_die = 1;
# if that failed, and:
@@ -1430,7 +1434,7 @@ sub load_tlpdb {
# download object
$::tldownload_server->enable if defined($::tldownload_server);
#
- $tlpdb = TeXLive::TLPDB->new(root => $master);
+ $tlpdb = TeXLive::TLPDB->new(root => $master, 'verify' => $opt_verify_downloads);
if (!defined($tlpdb)) {
tlwarn("Oh well, adding tlnet did not help.\n");
tlwarn(<<END_EXPLICIT_MIRROR);
@@ -2395,6 +2399,12 @@ This option is turned on by default, and the installation program will
fall back to using C<wget> if this is not possible. To disable usage of
LWP and persistent connections, use C<--no-persistent-downloads>.
+=item B<--no-verify-downloads>
+
+By default, if a GnuPG C<gpg> binary is found in the path, downloads are
+verified against a cryptographic signature. This option allows to
+disable it.
+
=item B<-portable>
Install for portable use, e.g., on a USB stick. Also selectable from