summaryrefslogtreecommitdiff
path: root/Master/install-tl.pl
diff options
context:
space:
mode:
authorNorbert Preining <preining@logic.at>2008-04-17 08:02:23 +0000
committerNorbert Preining <preining@logic.at>2008-04-17 08:02:23 +0000
commit0057c38056386ec2fa7171c13972417cd3d01241 (patch)
tree05f3738c4c3ab875f81302e5631919c28fe56719 /Master/install-tl.pl
parent4384299786a2e06413f870924dd95d2eb2e572fd (diff)
remove the "update from net" stuff, we will not support it but
will add support for adding binaries via tlmgr git-svn-id: svn://tug.org/texlive/trunk@7464 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl.pl')
-rwxr-xr-xMaster/install-tl.pl54
1 files changed, 13 insertions, 41 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl
index 02b44c8f2b9..3b26dac48d5 100755
--- a/Master/install-tl.pl
+++ b/Master/install-tl.pl
@@ -43,8 +43,8 @@ BEGIN {
}
use TeXLive::TLUtils qw(initialize_installer media platform platform_desc
- which getenv win32 unix program_exists architectures_available
- additional_architectures_available_from_net get_system_tmpdir member
+ which getenv win32 unix program_exists
+ get_system_tmpdir member
mkdirhier make_var_skeleton make_local_skeleton install_package copy
install_packages dirname tllog setup_programs);
use TeXLive::TLPOBJ;
@@ -96,9 +96,6 @@ $::LOGLEVELTERMINAL = $::LOG_NORMAL;
#
# $install{$packagename} == 1 if it should be installed
my %install;
-# if we should try to get additional binaries from the net
-# needs our since for menu ...
-our $trynet=0;
# the default scheme to be installed
my $default_scheme='scheme-full';
@@ -455,20 +452,14 @@ sub dump_vars {
# Determine which platforms are supported.
sub set_platforms_supported {
- my @binaries=architectures_available;
+ my @binaries = $tlpdb->available_architectures;
for my $binary (@binaries) {
- unless (defined $vars{"diskbin_$binary"}) {
- $vars{"diskbin_$binary"}=0;
- }
- }
- if ($trynet==1) {
- my @binaries=additional_architectures_available_from_net \%vars;
- for my $binary (@binaries) {
- $vars{"netbin_$binary"}=0;
+ unless (defined $vars{"binary_$binary"}) {
+ $vars{"binary_$binary"}=0;
}
}
for my $key (keys %vars) {
- ++$vars{'n_systems_available'} if ($key=~/^(disk|net)bin/);
+ ++$vars{'n_systems_available'} if ($key=~/^binary/);
}
}
@@ -540,10 +531,7 @@ sub calc_depends {
# compute the list of archs to be installed
my @archs;
foreach (keys %vars) {
- if (m/^diskbin_(.*)$/ ) {
- if ($vars{$_}) { push @archs, $1; }
- }
- if (m/^netbin_(.*)$/ ) {
+ if (m/^binary_(.*)$/ ) {
if ($vars{$_}) { push @archs, $1; }
}
}
@@ -667,32 +655,23 @@ sub set_install_platform {
my $wp='##'; # warning prefix
$warn_nobin="\n$wp WARNING! No binaries for your platform found! ";
- if (media eq 'CD') {
- $warn_nobin.="More binaries are available\n$wp on the DVD. The binary "
- . "systems menu allows you to download extra binaries\n"
- . "$wp from the network.\n";
- }
$warn_nobin_x86_64_linux="$warn_nobin" .
"$wp No binaries for x86_64-linux found, using i386-linux instead.\n";
my $ret = $warn_nobin;
- if (defined $vars{"diskbin_$detected_platform"}) {
- $vars{"diskbin_$detected_platform"}=1;
- $vars{'inst_platform'}=$detected_platform;
- $ret = $nowarn;
- } elsif (defined $vars{"netbin_$detected_platform"}) {
- $vars{"netbin_$detected_platform"}=1;
+ if (defined $vars{"binary_$detected_platform"}) {
+ $vars{"binary_$detected_platform"}=1;
$vars{'inst_platform'}=$detected_platform;
$ret = $nowarn;
} elsif ($detected_platform eq 'x86_64-linux') {
- $vars{'diskbin_i386-linux'}=1;
+ $vars{'binary_i386-linux'}=1;
$vars{'inst_platform'}='i386-linux';
$ret = $warn_nobin_x86_64_linux;
} else {
$ret = $warn_nobin;
}
foreach my $key (keys %vars) {
- if ($key=~/^diskbin.*/ or $key=~/^netbin.*/) {
+ if ($key=~/^binary.*/) {
++$vars{'n_systems_selected'} if $vars{$key}==1;
}
}
@@ -767,14 +746,7 @@ sub do_install_packages {
foreach my $package (sort keys %install) {
push @what, $package if ($install{$package} == 1);
}
- my @netarchs;
- foreach my $k (keys %vars) {
- if ($k =~ m/^netbin_(.*)$/) {
- my $a = $1;
- if ($vars{$k}) { push @netarchs, $a; }
- }
- }
- install_packages($tlpdb,$localtlpdb,\@what,\@netarchs,$vars{'option_src'},$vars{'option_doc'});
+ install_packages($tlpdb,$localtlpdb,\@what,$vars{'option_src'},$vars{'option_doc'});
}
# for later complete removal we want to save some options and values
@@ -1099,7 +1071,7 @@ sub update_numbers {
$vars{'n_collections_selected'} = 0;
$vars{'n_systems_selected'} = 0;
foreach my $key (keys %vars) {
- if ($key =~ /^(disk|net)bin/) {
+ if ($key =~ /^binary/) {
++$vars{'n_systems_available'};
++$vars{'n_systems_selected'} if $vars{$key} == 1;
}