summaryrefslogtreecommitdiff
path: root/Master/tlpkg/bin
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-05-05 15:33:32 +0000
committerKarl Berry <karl@freefriends.org>2017-05-05 15:33:32 +0000
commit954e90e0401c6bd409621066e68c4e55943eb35d (patch)
treec6fb7eb9561ee3d1988397ad899dbdd8e74a63b4 /Master/tlpkg/bin
parent8b018bd0ef8e6cc8e0a1333fea750ec0a6c0c035 (diff)
try $Id in pod again, ignore in nightly update
git-svn-id: svn://tug.org/texlive/trunk@44201 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/tlpkg/bin')
-rwxr-xr-xMaster/tlpkg/bin/tl-update-auto11
1 files changed, 5 insertions, 6 deletions
diff --git a/Master/tlpkg/bin/tl-update-auto b/Master/tlpkg/bin/tl-update-auto
index b3831871e7b..bb5d08420e0 100755
--- a/Master/tlpkg/bin/tl-update-auto
+++ b/Master/tlpkg/bin/tl-update-auto
@@ -170,13 +170,12 @@ done
#
if $config_scripts_only; then :; else
-# return 0 if files $1 and $2 are the same except for the first lines.
-# (we need to ignore the timestamps in the generation lines.)
-same_except_for_th ()
+# return 0 if files $1 and $2 are the same except for .TH and Id lines.
+same_except_for_auto ()
{
rm -f $TMPDIR/seft1 $TMPDIR/seft2
- sed '/^\.TH/d' <"$1" >$TMPDIR/seft1
- sed '/^\.TH/d' <"$2" >$TMPDIR/seft2
+ sed -e '/^\.TH/d' -e '/[$]Id:/d' <"$1" >$TMPDIR/seft1
+ sed -e '/^\.TH/d' -e '/[$]Id:/d' <"$2" >$TMPDIR/seft2
cmp -s $TMPDIR/seft1 $TMPDIR/seft2
}
@@ -190,7 +189,7 @@ for script in texmf-dist/scripts/texlive/tlmgr.pl install-tl; do
basescript=`basename $script .pl`
manfile=$mandir/man1/$basescript.1
- if same_except_for_th $manfile $temp; then
+ if same_except_for_auto $manfile $temp; then
$verbose " `basename $manfile` ok."
rm -f $manfile.new
else