diff options
Diffstat (limited to 'Master/tlpkg')
| -rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 11 |
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"; |