summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-05-04 00:39:04 +0000
committerKarl Berry <karl@freefriends.org>2008-05-04 00:39:04 +0000
commit4d333cbedce106da0ac6aa054a33ac28e6ec5641 (patch)
treefa145cc36e26ce6ba3a8d768e13dddd51791a83d /Master
parent1fa1b6fb6f9ae20fe5c0bb3290c0a239919b9db6 (diff)
don't duplicate long directory name, separate
special-case additions. git-svn-id: svn://tug.org/texlive/trunk@7833 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rwxr-xr-xMaster/tlpkg/bin/check-wrapper-consistency28
1 files changed, 19 insertions, 9 deletions
diff --git a/Master/tlpkg/bin/check-wrapper-consistency b/Master/tlpkg/bin/check-wrapper-consistency
index 94a00fa7ab4..abd8a729050 100755
--- a/Master/tlpkg/bin/check-wrapper-consistency
+++ b/Master/tlpkg/bin/check-wrapper-consistency
@@ -24,6 +24,7 @@ pod2usage(-exitstatus => 0, -verbose => 2) if $help;
exit (&main ());
+
sub main
{
my $err = 0;
@@ -34,18 +35,24 @@ sub main
my %w = &unx_wrapper_entries ("i386-linux");
- # add some additional wrappers which are currently not found
- # automatically
+ # add some additional wrappers which are not found
+ # automatically since they are not .. symlinks on Unix.
+ $w{'fmtutil-sys'} = 1;
$w{'getnonfreefonts-sys'} = 1;
- $w{'updmap-sys'} = 1;
$w{'updmap'} = 1;
- $w{'xindy'} = 1;
- $w{'texindy'} = 1;
- $w{'fmtutil-sys'} = 1;
+ $w{'updmap-sys'} = 1;
- $cww = "$Master/../Build/source/texk/texlive/tl-w32-starter.bat";
+ # these can be removed after we update all i386-linux binaries.
+ $w{'texindy'} = 1;
+ $w{'xindy'} = 1;
+
+ my $srcdir = "$Master/../Build/source/texk/texlive";
+ $cww = "$srcdir/tl-w32-starter.bat";
$err += &check_w32 ("win32", $cww, %w);
- system("cmp win32/tl-w32-wrapper.texlua $Master/../Build/source/texk/texlive/tl-w32-wrapper.texlua");
+
+ # one more.
+ $err += system ("cmp win32/tl-w32-wrapper.texlua"
+ . " $srcdir/tl-w32-wrapper.texlua");
return $err;
}
@@ -86,9 +93,12 @@ sub unx_wrapper_entries
sub check_w32
{
my ($w32dir, $w32canonical, %uw) = @_;
+ my $diff = 0;
for my $k (sort keys %uw) {
- system ("cmp $w32dir/$k.bat $w32canonical");
+ $diff += system ("cmp $w32dir/$k.bat $w32canonical");
#print "$k -> $uw{$k}\n";
}
+
+ return $diff;
}