From 09a053a777056ea3e246a6b2fc3df139c6dff9f1 Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Tue, 14 Mar 2006 06:08:05 +0000
Subject: Allow a sequence of digits at the end of the directory name when
 trying to determine the top directory. This allows the tool to find the
 correct top directory when you have something like:

   /x/llvm
   /x/llvm2
   /x/llvm3

Previously the scripts would always find /x/llvm even if you were in the
llvm2 or llvm3 directory because the pattern didn't allow the digits at
the end of the path.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26751 91177308-0d34-0410-b5e6-96231b3b80d8
---
 utils/llvmdo   | 2 +-
 utils/llvmgrep | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/utils/llvmdo b/utils/llvmdo
index 8d21eda427..2924c55ebd 100755
--- a/utils/llvmdo
+++ b/utils/llvmdo
@@ -43,7 +43,7 @@ if test ! -x "$PROGRAM" ; then
   exit 1
 fi
 shift;
-TOPDIR=`pwd | sed -e 's#\(.*/llvm\).*#\1#'`
+TOPDIR=`pwd | sed -e 's#\(.*/llvm[0-9]*\).*#\1#'`
 if test -d "$TOPDIR" ; then
   cd $TOPDIR
   case `uname -s` in
diff --git a/utils/llvmgrep b/utils/llvmgrep
index a1f77636c4..e5a08ad005 100755
--- a/utils/llvmgrep
+++ b/utils/llvmgrep
@@ -18,7 +18,8 @@
 # details.
 ##===----------------------------------------------------------------------===##
 
-TOPDIR=`pwd | sed -e 's#\(.*/llvm\).*#\1#'`
+TOPDIR=`pwd | sed -e 's#\(.*/llvm[0-9]*\).*#\1#'`
+echo $TOPDIR
 if test -d "$TOPDIR" ; then
   cd $TOPDIR
   case `uname -s` in
-- 
cgit v1.2.3