|
 |
15eccb |
diff -up grep-2.9/gnulib-tests/test-update-copyright.sh.orig grep-2.9/gnulib-tests/test-update-copyright.sh
|
|
|
15eccb |
--- grep-2.9/gnulib-tests/test-update-copyright.sh.orig 2011-01-03 21:57:35.000000000 +0100
|
|
|
15eccb |
+++ grep-2.9/gnulib-tests/test-update-copyright.sh 2011-07-11 11:39:18.000000000 +0200
|
|
|
15eccb |
@@ -231,7 +231,7 @@ Copyright (C) 1990-2005, 2007-2009 Acme,
|
|
|
15eccb |
# Software Foundation, Inc.
|
|
|
15eccb |
EOF
|
|
|
15eccb |
|
|
|
15eccb |
-rm $TMP*
|
|
|
15eccb |
+rm -f $TMP*
|
|
|
15eccb |
|
|
|
15eccb |
## -------------- ##
|
|
|
15eccb |
## Current year. ##
|
|
|
15eccb |
@@ -257,7 +257,7 @@ compare /dev/null $TMP-stderr || exit 1
|
|
|
15eccb |
compare - $TMP <
|
|
|
15eccb |
'\" Copyright (C) 2006, $YEAR Free Software Foundation, Inc.
|
|
|
15eccb |
EOF
|
|
|
15eccb |
-rm $TMP*
|
|
|
15eccb |
+rm -f $TMP*
|
|
|
15eccb |
|
|
|
15eccb |
## ------------------ ##
|
|
|
15eccb |
## Surrounding text. ##
|
|
|
15eccb |
@@ -281,7 +281,7 @@ dnl Undisturbed text.
|
|
|
15eccb |
dnl Copyright (C) 1989, 2010 Free Software Foundation, Inc.
|
|
|
15eccb |
dnl Undisturbed text.
|
|
|
15eccb |
EOF
|
|
|
15eccb |
-rm $TMP*
|
|
|
15eccb |
+rm -f $TMP*
|
|
|
15eccb |
|
|
|
15eccb |
## --------------- ##
|
|
|
15eccb |
## Widest prefix. ##
|
|
|
15eccb |
@@ -310,7 +310,7 @@ compare - $TMP <
|
|
|
15eccb |
#### Copyright (C) 1976-1988, 1999-2008, 2010-2011 Free Software
|
|
|
15eccb |
#### Foundation, Inc.
|
|
|
15eccb |
EOF
|
|
|
15eccb |
-rm $TMP*
|
|
|
15eccb |
+rm -f $TMP*
|
|
|
15eccb |
|
|
|
15eccb |
## ------------------- ##
|
|
|
15eccb |
## Prefix too large. ##
|
|
|
15eccb |
@@ -333,7 +333,7 @@ compare - $TMP <
|
|
|
15eccb |
#### 1986, 1987, 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
|
|
|
15eccb |
#### 2008 Free Software Foundation, Inc.
|
|
|
15eccb |
EOF
|
|
|
15eccb |
-rm $TMP*
|
|
|
15eccb |
+rm -f $TMP*
|
|
|
15eccb |
|
|
|
15eccb |
## ------------- ##
|
|
|
15eccb |
## Blank lines. ##
|
|
|
15eccb |
@@ -368,7 +368,7 @@ Copyright (C) 1976, 1977, 1978, 1979, 19
|
|
|
15eccb |
1986, 1987, 1988, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007,
|
|
|
15eccb |
2008 Free Software Foundation, Inc.
|
|
|
15eccb |
EOF
|
|
|
15eccb |
-rm $TMP*
|
|
|
15eccb |
+rm -f $TMP*
|
|
|
15eccb |
|
|
|
15eccb |
## -------------- ##
|
|
|
15eccb |
## Leading tabs. ##
|
|
|
15eccb |
@@ -397,7 +397,7 @@ compare - $TMP <
|
|
|
15eccb |
Copyright (C) 1987-1988, 1991-2011 Free Software Foundation,
|
|
|
15eccb |
Inc.
|
|
|
15eccb |
EOF
|
|
|
15eccb |
-rm $TMP*
|
|
|
15eccb |
+rm -f $TMP*
|
|
|
15eccb |
|
|
|
15eccb |
## -------------------- ##
|
|
|
15eccb |
## Unusual whitespace. ##
|
|
|
a2e822 |
@@ -434,7 +434,7 @@ compare - $TMP <
|
|
|
a2e822 |
compare - $TMP <
|
|
|
a2e822 |
# Copyright (C) 1987-2011 Free Software Foundation, Inc.
|
|
|
15eccb |
EOF
|
|
|
15eccb |
-rm $TMP*
|
|
|
15eccb |
+rm -f $TMP*
|
|
|
15eccb |
|
|
|
15eccb |
## --------- ##
|
|
|
15eccb |
## DOS EOL. ##
|
|
|
15eccb |
@@ -449,7 +449,7 @@ Rem 1998, 1999, 2000, 2001, 2002, 2003,
|
|
|
15eccb |
Rem 2009, 2010 Free Software Foundation, Inc.@
|
|
|
15eccb |
EOF
|
|
|
15eccb |
compare $TMP-exp $TMP || exit 1
|
|
|
15eccb |
-rm $TMP*
|
|
|
15eccb |
+rm -f $TMP*
|
|
|
15eccb |
|
|
|
15eccb |
## --------------- ##
|
|
|
15eccb |
## Omitted "(C)". ##
|
|
|
15eccb |
@@ -470,7 +470,7 @@ compare - $TMP <
|
|
|
15eccb |
1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
|
|
|
15eccb |
Free Software Foundation, Inc.
|
|
|
15eccb |
EOF
|
|
|
15eccb |
-rm $TMP*
|
|
|
15eccb |
+rm -f $TMP*
|
|
|
15eccb |
|
|
|
15eccb |
## ------------------ ##
|
|
|
15eccb |
## C-style comments. ##
|
|
|
15eccb |
@@ -532,6 +532,6 @@ compare - $TMP.extra-text-space <
|
|
|
15eccb |
Inc. ***
|
|
|
15eccb |
* End of comments. */
|
|
|
15eccb |
EOF
|
|
|
15eccb |
-rm $TMP*
|
|
|
15eccb |
+rm -f $TMP*
|
|
|
15eccb |
|
|
|
15eccb |
exit 0
|
|
|
15eccb |
diff -up grep-2.9/gnulib-tests/test-version-etc.sh.orig grep-2.9/gnulib-tests/test-version-etc.sh
|
|
|
15eccb |
--- grep-2.9/gnulib-tests/test-version-etc.sh.orig 2011-01-03 21:57:35.000000000 +0100
|
|
|
15eccb |
+++ grep-2.9/gnulib-tests/test-version-etc.sh 2011-07-11 11:40:12.706055333 +0200
|
|
|
15eccb |
@@ -38,6 +38,6 @@ EOT
|
|
|
15eccb |
tr -d '\015' |
|
|
|
15eccb |
diff -c $TMP - || ERR=1
|
|
|
15eccb |
|
|
|
15eccb |
-rm $TMP
|
|
|
15eccb |
+rm -f $TMP
|
|
|
15eccb |
|
|
|
15eccb |
exit $ERR
|