From cbb454150790aceec1153749302cb6e8f4449f1d Mon Sep 17 00:00:00 2001 From: jacob Date: Wed, 2 Feb 2005 20:07:58 +0000 Subject: [PATCH] apparently os x's cvs includes the full cvs repo path in CVS/Repository, but we only want the basename. --- build/branch.sh | 2 +- build/land1.sh | 2 +- build/merge1.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/branch.sh b/build/branch.sh index 328aeff..64c702e 100755 --- a/build/branch.sh +++ b/build/branch.sh @@ -12,7 +12,7 @@ parent=$1 child=$2 CHILD=`echo $child | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"` dir=${3:-.} -module=$(<$dir/CVS/Repository) +module=$(basename $(<$dir/CVS/Repository)) if [ "$module" = "lustre" ] ; then echo >&2 "${progname}: You probably want to branch lustre or portals." diff --git a/build/land1.sh b/build/land1.sh index 6b69eae..ce152f7 100755 --- a/build/land1.sh +++ b/build/land1.sh @@ -27,7 +27,7 @@ CHILD=`echo $child | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"` date=`date +%Y%m%d_%H%M` dir=${3:-.} -module=$(<$dir/CVS/Repository) +module=$(basename $(<$dir/CVS/Repository)) if [ "$module" = "lustre" ] ; then echo >&2 "${progname}: You probably want to branch lustre or portals, not the whole tree." diff --git a/build/merge1.sh b/build/merge1.sh index 29130fa..1fcebec 100755 --- a/build/merge1.sh +++ b/build/merge1.sh @@ -25,7 +25,7 @@ CHILD=`echo $child | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"` date=`date +%Y%m%d_%H%M` dir=${3:-.} -module=$(<$dir/CVS/Repository) +module=$(basename $(<$dir/CVS/Repository)) if [ "$module" = "lustre" ] ; then echo >&2 "${progname}: You probably want to branch lustre or portals, not the whole tree." -- 1.8.3.1