diff options
| -rw-r--r-- | Build/source/texk/kpathsea/ChangeLog | 6 | ||||
| -rwxr-xr-x | Build/source/texk/kpathsea/mktexlsr | 17 | ||||
| -rwxr-xr-x | Master/bin/i386-linux/mktexlsr | 15 |
3 files changed, 23 insertions, 15 deletions
diff --git a/Build/source/texk/kpathsea/ChangeLog b/Build/source/texk/kpathsea/ChangeLog index d0b3081258d..f1e521c87b4 100644 --- a/Build/source/texk/kpathsea/ChangeLog +++ b/Build/source/texk/kpathsea/ChangeLog @@ -1,3 +1,9 @@ +2008-05-18 Karl Berry <karl@tug.org> + + * mktexlsr (vc_dirs): ignore more than just .svn. + Original suggestion from Michael Schutte, Debian bug 481371, + 16 May 2008 11:31:20. + 2008-05-05 Karl Berry <karl@tug.org> * recorder.h: declare our fn variables extern as they should be. diff --git a/Build/source/texk/kpathsea/mktexlsr b/Build/source/texk/kpathsea/mktexlsr index 9f729e4d495..bc2affca10c 100755 --- a/Build/source/texk/kpathsea/mktexlsr +++ b/Build/source/texk/kpathsea/mktexlsr @@ -13,7 +13,7 @@ # <te@dbs.uni-hannover.de>, Okt., 1994. # Public domain. -version='$Id: mktexlsr,v 1.46 2005/06/21 14:32:26 olaf Exp $' +version='$Id$' progname=`echo $0 | sed 's%.*/%%'` usage="Usage: $progname [DIR]... @@ -138,18 +138,19 @@ for TEXMFLS_R in "$@"; do echo "$ls_R_magic" >"$db_file_tmp" # The main task. We put ./: in the output, so top-level files can be - # found via ls-R. Probably irrelevant in practice. - # The sed command inserts the leading ./ for directory names, and - # removes ., .., and .svn entries from the list. Also omit contents - # of any .svn directories; sed apparently requires that we do that - # operation in a separate invocation. - # We do not try to support colons in directory names. + # found via ls-R. Probably irrelevant in practice. The sed command + # inserts the leading ./ for directory names, and removes ., .., and + # version control entries from the list. Also omit contents of any + # the version directories; sed apparently requires that we do that + # operation in a separate invocation. We do not try to support colons + # in directory names. # echo "./:" >>"$db_file_tmp" + vc_dirs='\.\(bzr\|git\|hg\|svn\)\|CVS\|RCS\|_darcs' (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) \ | sed -e '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^\.svn$/d;' \ -e '/^[\.\/]*lsR[0-9]*\.tmp:*$/d' \ - | sed -e '/\.svn.*:$/,/^$/d' \ + | sed -e /$vc_dirs'.*:$/,/^$/d' \ >>"$db_file_tmp" # To be really safe, a loop. diff --git a/Master/bin/i386-linux/mktexlsr b/Master/bin/i386-linux/mktexlsr index 9f729e4d495..1d16156b78a 100755 --- a/Master/bin/i386-linux/mktexlsr +++ b/Master/bin/i386-linux/mktexlsr @@ -138,18 +138,19 @@ for TEXMFLS_R in "$@"; do echo "$ls_R_magic" >"$db_file_tmp" # The main task. We put ./: in the output, so top-level files can be - # found via ls-R. Probably irrelevant in practice. - # The sed command inserts the leading ./ for directory names, and - # removes ., .., and .svn entries from the list. Also omit contents - # of any .svn directories; sed apparently requires that we do that - # operation in a separate invocation. - # We do not try to support colons in directory names. + # found via ls-R. Probably irrelevant in practice. The sed command + # inserts the leading ./ for directory names, and removes ., .., and + # version control entries from the list. Also omit contents of any + # the version directories; sed apparently requires that we do that + # operation in a separate invocation. We do not try to support colons + # in directory names. # echo "./:" >>"$db_file_tmp" + vc_dirs='\.\(bzr\|git\|hg\|svn\)\|CVS\|RCS\|_darcs' (cd "$TEXMFLS_R" && \ls -LRa 2>/dev/null) \ | sed -e '/^$/{n;s%^\./%%;s%^%./%;}; /^\.$/d; /^\.\.$/d; /^\.svn$/d;' \ -e '/^[\.\/]*lsR[0-9]*\.tmp:*$/d' \ - | sed -e '/\.svn.*:$/,/^$/d' \ + | sed -e /$vc_dirs'.*:$/,/^$/d' \ >>"$db_file_tmp" # To be really safe, a loop. |