X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=build%2Fbranch.sh;h=0b9b1cd2cc1d12dda74a36b33b2fef4db6eddf1a;hp=023a3f192ad9e366d03809e91e524dd5407daaca;hb=d2d56f38da01001c92a09afc6b52b5acbd9bc13c;hpb=5be0be72107f329caec160df3835ab377e8dee2c

diff --git a/build/branch.sh b/build/branch.sh
index 023a3f1..0b9b1cd 100755
--- a/build/branch.sh
+++ b/build/branch.sh
@@ -1,4 +1,4 @@
-#!/bin/sh -e 
+#!/bin/bash -e 
 CVS=${CVS:-cvs}
 
 progname=${0##*/}
@@ -12,10 +12,14 @@ parent=$1
 child=$2
 CHILD=`echo $child | sed -e "s/^b_//" | tr "[a-z]" "[A-Z]"`
 dir=${3:-.}
+if [ ! -d $dir ]; then
+    echo >&2 "${progname}: directory '$dir' does not exist."
+    exit 1
+fi
 module=$(basename $(<$dir/CVS/Repository))
 
-if [ "$module" = "lustre" ] ; then
-    echo >&2 "${progname}: You probably want to branch lustre or portals."
+if [ "$module" = "lustre" ]; then
+    echo >&2 "${progname}: You probably want to branch lustre or lnet."
     echo >&2 "${progname}: Try using ${0} $parent $child lustre"
     exit 1
 fi
@@ -31,10 +35,13 @@ case $child in
   *) child="b_$child"
 esac
 
-if test "$parent" != "HEAD" && test -f $dir/CVS/Tag && "`cat $dir/CVS/Tag`" != "T$parent"; then
-	echo "This script must be run within the $parent branch"
-	exit 1
-fi
+#if [ "$parent" != "HEAD" -a -f $dir/CVS/Tag ]; then
+	# put in separate condition as bash evaluates all conditions unlike C
+#	if [ "`cat $dir/CVS/Tag`" != "T$parent" ]; then
+#		echo "This script must be run within the $parent branch"
+#		exit 1
+#	fi
+#fi
 
 echo parent: $parent CHILD: $CHILD child: $child date: $date