summaryrefslogtreecommitdiff
path: root/merge-helpers
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@OARcorp.com>2010-08-08 14:57:41 +0000
committerJoel Sherrill <joel.sherrill@OARcorp.com>2010-08-08 14:57:41 +0000
commit553af3e912e620892fa697d7bbf129ada353699f (patch)
tree8c1441ded833d9d541e330b67a506f7c481e2628 /merge-helpers
parent17e6cff1baa51caa56016ea32d6cd3f9dc057544 (diff)
2010-08-08 Joel Sherrill <joel.sherrill@oarcorp.com>
* check_bsp: Add CVS Id and blanks at EOL.
Diffstat (limited to 'merge-helpers')
-rw-r--r--merge-helpers/ChangeLog4
-rwxr-xr-xmerge-helpers/check_bsp9
2 files changed, 10 insertions, 3 deletions
diff --git a/merge-helpers/ChangeLog b/merge-helpers/ChangeLog
index cc59a58..ab1df46 100644
--- a/merge-helpers/ChangeLog
+++ b/merge-helpers/ChangeLog
@@ -1,5 +1,9 @@
2010-08-08 Joel Sherrill <joel.sherrill@oarcorp.com>
+ * check_bsp: Add CVS Id and blanks at EOL.
+
+2010-08-08 Joel Sherrill <joel.sherrill@oarcorp.com>
+
* check_bsp: Add more checks.
2009-09-10 Joel Sherrill <joel.sherrill@oarcorp.com>
diff --git a/merge-helpers/check_bsp b/merge-helpers/check_bsp
index f71a7c1..00fd4e7 100755
--- a/merge-helpers/check_bsp
+++ b/merge-helpers/check_bsp
@@ -5,6 +5,9 @@
# Test for:
# - presense of BSP_BOOTCARD_OPTIONS
# - XXX
+# - XXX
+#
+# $Id$
#
if [ $# -ne 1 ] ; then
@@ -29,7 +32,7 @@ fi
test_its_there()
{
if [ $# -ne 2 ] ; then
- echo Usage: $0 FILE pattern
+ echo Usage: $0 FILE pattern
fi
grep ${2} ${1} >/dev/null
if [ $? -ne 0 ] ; then
@@ -41,7 +44,7 @@ test_its_there()
test_its_NOT_there_all_case()
{
if [ $# -lt 2 ] ; then
- echo Usage: $0 FILE pattern
+ echo Usage: $0 FILE pattern
fi
FILE=$1
shift
@@ -54,7 +57,7 @@ test_its_NOT_there_all_case()
test_its_NOT_there()
{
if [ $# -lt 2 ] ; then
- echo Usage: $0 FILE pattern
+ echo Usage: $0 FILE pattern
fi
FILE=$1
shift