diff options
author | Karl Berry <karl@freefriends.org> | 2017-05-05 15:33:32 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2017-05-05 15:33:32 +0000 |
commit | 954e90e0401c6bd409621066e68c4e55943eb35d (patch) | |
tree | c6fb7eb9561ee3d1988397ad899dbdd8e74a63b4 /Master | |
parent | 8b018bd0ef8e6cc8e0a1333fea750ec0a6c0c035 (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')
-rwxr-xr-x | Master/install-tl | 3 | ||||
-rwxr-xr-x | Master/texmf-dist/scripts/texlive/tlmgr.pl | 1 | ||||
-rwxr-xr-x | Master/tlpkg/bin/tl-update-auto | 11 |
3 files changed, 9 insertions, 6 deletions
diff --git a/Master/install-tl b/Master/install-tl index 71429d3ece9..0701e91272f 100755 --- a/Master/install-tl +++ b/Master/install-tl @@ -2909,8 +2909,11 @@ This script and its documentation were written for the TeX Live distribution (L<http://tug.org/texlive>) and both are licensed under the GNU General Public License Version 2 or later. +$Id$ =cut +# to remake HTML version: pod2html --cachedir=/tmp install-tl >/tmp/itl.html + ### Local Variables: ### perl-indent-level: 2 ### tab-width: 2 diff --git a/Master/texmf-dist/scripts/texlive/tlmgr.pl b/Master/texmf-dist/scripts/texlive/tlmgr.pl index f5ce1249910..e40d1a30177 100755 --- a/Master/texmf-dist/scripts/texlive/tlmgr.pl +++ b/Master/texmf-dist/scripts/texlive/tlmgr.pl @@ -8809,6 +8809,7 @@ This script and its documentation were written for the TeX Live distribution (L<http://tug.org/texlive>) and both are licensed under the GNU General Public License Version 2 or later. +$Id$ =cut # to remake HTML version: pod2html --cachedir=/tmp tlmgr.pl >/tmp/tlmgr.html 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 |