summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Build/source/texk/tests/TeXLive/TLUtils.pm5
-rwxr-xr-xMaster/tlpkg/bin/tl-check-wrapper-consistency2
-rwxr-xr-xMaster/tlpkg/bin/tl-update-bindir3
-rwxr-xr-xMaster/tlpkg/bin/tl-update-ctan-mirrors2
-rw-r--r--Master/tlpkg/doc/releng.txt3
5 files changed, 8 insertions, 7 deletions
diff --git a/Build/source/texk/tests/TeXLive/TLUtils.pm b/Build/source/texk/tests/TeXLive/TLUtils.pm
index a427da17117..9c0d5a80178 100644
--- a/Build/source/texk/tests/TeXLive/TLUtils.pm
+++ b/Build/source/texk/tests/TeXLive/TLUtils.pm
@@ -7,7 +7,7 @@ use strict; use warnings;
package TeXLive::TLUtils;
-my $svnrev = '$Revision: 66236 $';
+my $svnrev = '$Revision: 66420 $';
my $_modulerevision = ($svnrev =~ m/: ([0-9]+) /) ? $1 : "unknown";
sub module_revision { return $_modulerevision; }
@@ -718,8 +718,9 @@ if status was nonzero. Throw away stdout and stderr.
=cut
sub system_ok {
+ my $nulldev = nulldev();
my ($cmdline) = @_;
- `$cmdline >/dev/null 2>&1`;
+ `$cmdline >$nulldev 2>&1`;
return $? == 0;
}
diff --git a/Master/tlpkg/bin/tl-check-wrapper-consistency b/Master/tlpkg/bin/tl-check-wrapper-consistency
index e3778ac711a..b7c6dd8c356 100755
--- a/Master/tlpkg/bin/tl-check-wrapper-consistency
+++ b/Master/tlpkg/bin/tl-check-wrapper-consistency
@@ -92,7 +92,7 @@ sub check_w32 {
next if $is_shell_script{$k}; # skip shell scripts
#
# skip {context,mtxrun}.lua:
- next if $k =~ /\.lua$/
+ next if $k =~ /\.lua$/;
#
# also skip these special cases:
next if $k =~
diff --git a/Master/tlpkg/bin/tl-update-bindir b/Master/tlpkg/bin/tl-update-bindir
index 3ee215d92a4..ee80737620b 100755
--- a/Master/tlpkg/bin/tl-update-bindir
+++ b/Master/tlpkg/bin/tl-update-bindir
@@ -275,11 +275,10 @@ for tlplat in $tlplats; do
ourdel=$tmpdir/2del
ouradd=$tmpdir/2add
- # looking for deletions, but don't delete (x)asy, biber, xindy, context.
+ # looking for deletions, but don't delete (x)asy, biber, context, xindy.
comm -23 $tmpdir/now $tmpdir/new \
| egrep -v '^(x?asy(\.exe)?|freeglut\.dll)$' \
| egrep -v '^biber(-ms)?(\.exe)?$' \
- | egrep -v '^dvisvgm$' \
| egrep -v '^(luametatex|context(.lua))?|mtxrun$' \
| egrep -v 'xindy' \
>$ourdel # intentionally anything matching xindy
diff --git a/Master/tlpkg/bin/tl-update-ctan-mirrors b/Master/tlpkg/bin/tl-update-ctan-mirrors
index a337d105d77..2e3cf50c1b4 100755
--- a/Master/tlpkg/bin/tl-update-ctan-mirrors
+++ b/Master/tlpkg/bin/tl-update-ctan-mirrors
@@ -134,7 +134,7 @@ sub add_mirror {
}
} else {
# CTAN.sites has many more urls than mirmon, so don't worry about it.
- warn " not in mirmon file, skipped: $url\n" if $verbose;
+ warn " not in mirmon file, skipped: $url\n" if $verbose > 1;
# Also the mirmon file has some old urls that aren't in CTAN.sites,
# so don't worry about that direction either, on occasion.
}
diff --git a/Master/tlpkg/doc/releng.txt b/Master/tlpkg/doc/releng.txt
index d49e11a9dad..29baf164344 100644
--- a/Master/tlpkg/doc/releng.txt
+++ b/Master/tlpkg/doc/releng.txt
@@ -494,7 +494,8 @@ cd
umount /mnt/tl
# make files unwritable, we should never change;
# but keep directories writable, else backup-external fails.
-find "$@" -xtype f -print0 | xargs -0 chmod a-w,a+r /usr/local/texlive-rel/
+find "$@" -type f -print | xargs chmod a-w,a+r /usr/local/texlive-rel/
+find "$@" -type d -print | xargs chmod a+rwX /usr/local/texlive-rel/
- update ~www/texlive web pages (search for $prev and $prev-1):
acquire* - general