[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] ccvs/src ChangeLog sanity.sh
From: |
Mark D. Baushke |
Subject: |
[Cvs-cvs] ccvs/src ChangeLog sanity.sh |
Date: |
Fri, 16 Jun 2006 07:42:09 +0000 |
CVSROOT: /cvsroot/cvs
Module name: ccvs
Changes by: Mark D. Baushke <mdb> 06/06/16 07:42:09
Modified files:
src : ChangeLog sanity.sh
Log message:
* sanity.sh (expr_set_DASHDASH): Fix for non-POSIX expr
implementations.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/ChangeLog?cvsroot=cvs&r1=1.3449&r2=1.3450
http://cvs.savannah.gnu.org/viewcvs/ccvs/src/sanity.sh?cvsroot=cvs&r1=1.1154&r2=1.1155
Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/ChangeLog,v
retrieving revision 1.3449
retrieving revision 1.3450
diff -u -b -r1.3449 -r1.3450
--- ChangeLog 15 Jun 2006 15:46:33 -0000 1.3449
+++ ChangeLog 16 Jun 2006 07:42:08 -0000 1.3450
@@ -1,3 +1,8 @@
+2006-06-16 Mark D. Baushke <address@hidden>
+
+ * sanity.sh (expr_set_DASHDASH): Fix for non-POSIX expr
+ implementations.
+
2006-06-15 Mark D. Baushke <address@hidden>
* sanity.sh (conflicts4): Use $SECONDARY_CVSROOT_DIRNAME where
Index: sanity.sh
===================================================================
RCS file: /cvsroot/cvs/ccvs/src/sanity.sh,v
retrieving revision 1.1154
retrieving revision 1.1155
diff -u -b -r1.1154 -r1.1155
--- sanity.sh 15 Jun 2006 15:46:33 -0000 1.1154
+++ sanity.sh 16 Jun 2006 07:42:08 -0000 1.1155
@@ -1155,14 +1155,21 @@
{
expr=$1
exprDASHDASH='false'
-if $expr $exprDASHDASH "-rw-rw-r--" : "-rw-rw-r--" >/dev/null 2>&1; then
+# Not POSIX, but works on a lot of expr versions.
+if $expr "-rw-rw-r--" : "-rw-rw-r--" >/dev/null 2>&1; then
# good, it works
return 0
else
+ # Do things in the POSIX manner.
if $expr -- "-rw-rw-r--" : "-rw-rw-r--" >/dev/null 2>&1; then
exprDASHDASH=':'
return 0
else
+ echo 'WARNING: Your $expr does not correctly handle'
+ echo 'leading "-" characters in regular expressions to'
+ echo 'be matched. You may wish to see if there is an'
+ echo 'environment variable or other setting to allow'
+ echo 'POSIX functionality to be enabled.'
return 77
fi
fi
@@ -1177,9 +1184,10 @@
expr_set_ENDANCHOR ${EXPR} >/dev/null
expr_tooltest_DOTSTAR ${EXPR} >/dev/null
-# Set the exprDASHDASH for the chosen expr version
+# Is $EXPR a POSIX or non-POSIX implementation
+# with regard to command-line arguments?
expr_set_DASHDASH ${EXPR}
-[ $exprDASHDASH ] && EXPR="$EXPR --"
+$exprDASHDASH && EXPR="$EXPR --"
echo "Using EXPR=$EXPR" >>$LOGFILE
echo "Using ENDANCHOR=$ENDANCHOR" >>$LOGFILE