ignore more than just .svn

git-svn-id: svn://tug.org/texlive/trunk@8210 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 8 insertions, 7 deletions

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.