summaryrefslogtreecommitdiff
path: root/Master/tlpkg
diff options
context:
space:
mode:
authorReinhard Kotucha <reinhard.kotucha@web.de>2007-10-07 21:10:48 +0000
committerReinhard Kotucha <reinhard.kotucha@web.de>2007-10-07 21:10:48 +0000
commit405dcbdf3bacec10202779d05bd5db22db168c13 (patch)
treebb366b2d6114be1dc0e23de7c4df4dfe79bf9cf3 /Master/tlpkg
parente130a3332005f460860734efe166df78eb5d25c6 (diff)
TLUtils.pm: bugfixes.
install-tl.pl: new, but far from being ready. git-svn-id: svn://tug.org/texlive/trunk@5133 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r--Master/tlpkg/TeXLive/TLUtils.pm11
1 files changed, 7 insertions, 4 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm
index 62c24a9aa39..8418aa23aea 100644
--- a/Master/tlpkg/TeXLive/TLUtils.pm
+++ b/Master/tlpkg/TeXLive/TLUtils.pm
@@ -134,7 +134,10 @@ sub platform {
if (-d "/usr/bin") {
my $CPU; # CPU type as reported by config.guess.
my $OS; # O/S type as reported by config.guess.
- my $guessed_platform=`$::_installerdir_/config.guess`;
+ # We cannot rely on #! in config.guess but have to call /bin/sh
+ # explicitly because sometimes the 'noexec' flag is set in
+ # /etc/fstab for ISO9660 file systems.
+ my $guessed_platform=`/bin/sh $::_installerdir_/config.guess`;
chomp $guessed_platform;
($CPU=$guessed_platform)=~s/(.*?)-.*/$1/;
foreach my $os (@OSs) {
@@ -538,7 +541,7 @@ sub binaries_available_from_disk {
if (&media eq "CD") {
opendir DIR, "$::_installerdir_/archive";
} elsif (&media eq "DVD") {
- opendir DIR, "$::_installerdir_/texmf/bin";
+ opendir DIR, "$::_installerdir_/bin";
} else {
die "Media type must be CD or DVD.\n";
}
@@ -551,8 +554,8 @@ sub binaries_available_from_disk {
}
}
} elsif (&media eq "DVD") {
- for (@dir) {
- push @platforms, $1 unless (/^\./);
+ for my $platform (@dir) {
+ push @platforms, $platform unless ($platform=~/^\./);
}
} else {
die "Media type must be CD or DVD.\n";