diff options
author | Reinhard Kotucha <reinhard.kotucha@web.de> | 2007-10-06 20:42:27 +0000 |
---|---|---|
committer | Reinhard Kotucha <reinhard.kotucha@web.de> | 2007-10-06 20:42:27 +0000 |
commit | 093f00299f7d2ac7d65d7a57a4c17e091a64ea91 (patch) | |
tree | f538371f7ab87761c2b315f51edd13c659a3c9c1 /Master/tlpkg | |
parent | dae0497dfdfe53172758b10dcee4bf9c8b026c88 (diff) |
TLUtils.pm: bugfixes. And rely on umask instead of setting mode explicitly.
git-svn-id: svn://tug.org/texlive/trunk@5125 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg')
-rw-r--r-- | Master/tlpkg/TeXLive/TLUtils.pm | 62 |
1 files changed, 29 insertions, 33 deletions
diff --git a/Master/tlpkg/TeXLive/TLUtils.pm b/Master/tlpkg/TeXLive/TLUtils.pm index 87f9e9d7615..62c24a9aa39 100644 --- a/Master/tlpkg/TeXLive/TLUtils.pm +++ b/Master/tlpkg/TeXLive/TLUtils.pm @@ -10,8 +10,6 @@ package TeXLive::TLUtils; use Fcntl; # required by copy() -#use File::Basename; - =pod =head1 NAME @@ -142,8 +140,8 @@ sub platform { foreach my $os (@OSs) { $OS=$os if $guessed_platform=~/$os/; } - if ($OS=~/^i.86$/) { - $OS=~s/i.86/i386/; + if ($CPU=~/^i.86$/) { + $CPU=~s/i.86/i386/; } if (length "$OS" < 0) { ($OS=$guessed_platform)=~s/.*-(.*)/$1/; @@ -436,9 +434,9 @@ sub copy { $mode=$stat[2]; # set write bit for user if necessary. - $mode+=128 if ($mode%256<128); + #$mode+=128 if ($mode%256<128); - mkdirhier ("$destdir", $dirmode) unless -d "$destdir"; + mkdirhier ("$destdir") unless -d "$destdir"; $filename=basename "$infile"; $outfile="$destdir/$filename"; @@ -453,7 +451,7 @@ sub copy { or die "Can't open '$infile': $!\n"; binmode IN; - sysopen OUT, "$outfile", (O_CREAT|O_WRONLY) , $mode + sysopen OUT, "$outfile", (O_CREAT|O_WRONLY) or die "Can't open '$outfile': $!\n"; binmode OUT; @@ -578,7 +576,7 @@ sub binaries_available_from_net { open TLPDB, "wget -q --output-document=- $::texlive_url/texlive.tlpdb|" or die "Can't open $::texlive_url/texlive.tlpdb"; while (<TLPDB>) { - if (/^bin\/(.*)\/kpsewhich/) { + if (/^ bin\/(.*)\/kpsewhich/) { push @platforms, $1; } } @@ -595,18 +593,17 @@ Generate a skeleton of empty directories in the C<TEXMFSYSVAR> tree. sub make_var_skeleton { my $prefix=shift; - my $mode=0777; - - mkdirhier "$prefix/tex/generic/config", $mode; - mkdirhier "$prefix/dvipdfm/config", $mode; - mkdirhier "$prefix/tex/plain/config", $mode; - mkdirhier "$prefix/dvips/config", $mode; - mkdirhier "$prefix/fonts/map/dvipdfm/updmap", $mode; - mkdirhier "$prefix/fonts/map/dvips/updmap", $mode; - mkdirhier "$prefix/fonts/map/pdftex/updmap", $mode; - mkdirhier "$prefix/web2c", $mode; - mkdirhier "$prefix/xdvi", $mode; - mkdirhier "$prefix/tex/context/config", $mode; + + mkdirhier "$prefix/tex/generic/config"; + mkdirhier "$prefix/dvipdfm/config"; + mkdirhier "$prefix/tex/plain/config"; + mkdirhier "$prefix/dvips/config"; + mkdirhier "$prefix/fonts/map/dvipdfm/updmap"; + mkdirhier "$prefix/fonts/map/dvips/updmap"; + mkdirhier "$prefix/fonts/map/pdftex/updmap"; + mkdirhier "$prefix/web2c"; + mkdirhier "$prefix/xdvi"; + mkdirhier "$prefix/tex/context/config"; } =pod @@ -619,19 +616,18 @@ Generate a skeleton of empty directories in the C<TEXMFLOCAL> tree. sub make_local_skeleton { my $prefix=shift; - my $mode=0755; - - mkdirhier "$prefix/tex/latex/local", $mode; - mkdirhier "$prefix/tex/plain/local", $mode; - mkdirhier "$prefix/dvips/local", $mode; - mkdirhier "$prefix/bibtex/bib/local", $mode; - mkdirhier "$prefix/bibtex/bst/local", $mode; - mkdirhier "$prefix/fonts/tfm/local", $mode; - mkdirhier "$prefix/fonts/vf/local", $mode; - mkdirhier "$prefix/fonts/source/local", $mode; - mkdirhier "$prefix/fonts/type1/local", $mode; - mkdirhier "$prefix/metapost/local", $mode; - mkdirhier "$prefix/web2c", $mode; + + mkdirhier "$prefix/tex/latex/local"; + mkdirhier "$prefix/tex/plain/local"; + mkdirhier "$prefix/dvips/local"; + mkdirhier "$prefix/bibtex/bib/local"; + mkdirhier "$prefix/bibtex/bst/local"; + mkdirhier "$prefix/fonts/tfm/local"; + mkdirhier "$prefix/fonts/vf/local"; + mkdirhier "$prefix/fonts/source/local"; + mkdirhier "$prefix/fonts/type1/local"; + mkdirhier "$prefix/metapost/local"; + mkdirhier "$prefix/web2c"; } |