diff options
author | Reinhard Kotucha <reinhard.kotucha@web.de> | 2007-11-26 01:05:26 +0000 |
---|---|---|
committer | Reinhard Kotucha <reinhard.kotucha@web.de> | 2007-11-26 01:05:26 +0000 |
commit | c1c056a76b96734598543e2cfd7c93a29a44edd0 (patch) | |
tree | 80561ef06b55d8ccde6e45c78f632f5f61df0c9c /Master/install-tl.pl | |
parent | 7f77a258eefb648b8ca55e00202850ccd88e45ec (diff) |
TLUtils.pm: install_package
install-tl.pl: $installerdir
git-svn-id: svn://tug.org/texlive/trunk@5594 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/install-tl.pl')
-rwxr-xr-x | Master/install-tl.pl | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Master/install-tl.pl b/Master/install-tl.pl index c326702a6ef..661f334835b 100755 --- a/Master/install-tl.pl +++ b/Master/install-tl.pl @@ -13,14 +13,14 @@ BEGIN { $^W = 1; my $me=$0; $me=~s!\\!/!g if $^O=~/^MSWin(32|64)$/i; - ($thisdir=$me)=~s!(.*)/.*$!$1!; - unshift (@INC, "$thisdir/tlpkg"); + ($installerdir=$me)=~s!(.*)/.*$!$1!; + unshift (@INC, "$installerdir/tlpkg"); } use TeXLive::TLUtils qw(initialize_installer media platform platform_desc debug which getenv win32 unix program_exists architectures_available additional_architectures_available_from_net get_system_tmpdir member - mkdirhier make_var_skeleton make_local_skeleton); + mkdirhier make_var_skeleton make_local_skeleton install_package); use TeXLive::TLPOBJ; use TeXLive::TLPDB; use TeXLive::TLConfig; @@ -29,20 +29,22 @@ use Cwd; $default_scheme='scheme-full'; ###$texlive_url='http://localhost/texlive/Contents/inst'; -$texlive_url='http://tug.org/svn/texlive/trunk/Master/' - . "$TeXLive::TLConfig::InfraLocation"; +$texlive_url='http://tug.org/svn/texlive/trunk/Master'; +$texlive_db_url="$texlive_url/$TeXLive::TLConfig::InfraLocation"; # The maximum number of binary systems on the CD. This number must be # smaller than the number of binaries available from the network. $max_bins_on_CD=7; -initialize_installer; my $system_tmpdir=get_system_tmpdir; print "Platform: ", platform, " => \'", platform_desc(platform), "\'\n"; print "Media: ", media, "\n"; print "Directory for Temporary Files: '", get_system_tmpdir, "\'\n"; +print "Installer Directory: '$::installerdir'\n"; + +initialize_installer; # The global variable %vars is an associative list which contains all # variables and their values which can be changed by the user. @@ -315,7 +317,7 @@ sub load_tlpdb { if (media eq 'NET') { $database="http://www.tug.org/svn/texlive/trunk/Master/$TeXLive::TLConfig::InfraLocation/texlive.tlpdb"; } else { - $database="./$TeXLive::TLConfig::InfraLocation/texlive.tlpdb"; + $database="$installerdir/$TeXLive::TLConfig::InfraLocation/texlive.tlpdb"; } print "Loading $database ...\n"; $::tlpdb=TeXLive::TLPDB->new(location => "$database"); @@ -1089,7 +1091,7 @@ sub install_files { } } my $destination="$vars{TEXDIR}"; - foreach my $p (keys %install) { + foreach my $p (sort keys %install) { print "INSTALL $p\n" if ($install{$p} == 1); my $containerdir=container_location($p); add_tlpcontainer($p, $containerdir, $destination); |