9 files changed, 15 insertions, 15 deletions
diff --git a/tests/tail-2/append-only b/tests/tail-2/append-only
index f5dcb17cd..ee7924540 100755
--- a/tests/tail-2/append-only
+++ b/tests/tail-2/append-only
@@ -28,7 +28,7 @@ PRIV_CHECK_ARG=require-root . $srcdir/../priv-check
 
 pwd=`pwd`
 t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
-trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
+trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0
 trap '(exit $?); exit $?' 1 2 13 15
 
 framework_failure=0
diff --git a/tests/tail-2/assert b/tests/tail-2/assert
index 4d46904fd..31148e929 100755
--- a/tests/tail-2/assert
+++ b/tests/tail-2/assert
@@ -32,7 +32,7 @@ fi
 
 tmp=tail-assert.$$
 pwd=`pwd`
-trap "cd $pwd; rm -rf $tmp" 0 1 2 3 15
+trap 'cd "$pwd" && rm -rf $tmp' 0 1 2 3 15
 
 test_failure=0
 mkdir $tmp || test_failure=1
diff --git a/tests/tail-2/assert-2 b/tests/tail-2/assert-2
index 10f3f1961..cf9e2629c 100755
--- a/tests/tail-2/assert-2
+++ b/tests/tail-2/assert-2
@@ -3,7 +3,7 @@
 # Due to a race condition in the test, the `assert' script would get
 # the UMR on Solaris only some of the time, and not at all on Linux/GNU.
 
-# Copyright (C) 2000 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@ fi
 
 tmp=tail-as2.$$
 pwd=`pwd`
-trap "cd $pwd; rm -rf $tmp" 0 1 2 3 15
+trap 'cd "$pwd" && rm -rf $tmp' 0 1 2 3 15
 
 test_failure=0
 mkdir $tmp || test_failure=1
diff --git a/tests/tail-2/big-4gb b/tests/tail-2/big-4gb
index 5f94cb68f..b0ca79d28 100755
--- a/tests/tail-2/big-4gb
+++ b/tests/tail-2/big-4gb
@@ -2,7 +2,7 @@
 # Demonstrate a bug in `tail -cN' when operating on files of size 4G and larger
 # Fixed in coreutils-4.5.2.
 
-# Copyright (C) 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ fi
 
 pwd=`pwd`
 t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
-trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
+trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0
 trap '(exit $?); exit $?' 1 2 13 15
 
 framework_failure=0
diff --git a/tests/tail-2/fflush b/tests/tail-2/fflush
index e78de66e8..0aa80afd4 100755
--- a/tests/tail-2/fflush
+++ b/tests/tail-2/fflush
@@ -3,7 +3,7 @@
 # The problem was that using the solaris5.7 setvbuf function to turn off
 # buffering doesn't flush stdout.
 
-# Copyright (C) 1999, 2000, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@ fi
 
 tmp=tail-flush.$$
 pwd=`pwd`
-trap "cd $pwd; rm -rf $tmp" 0 1 2 3 15
+trap 'cd "$pwd" && rm -rf $tmp' 0 1 2 3 15
 
 test_failure=0
 mkdir $tmp || test_failure=1
diff --git a/tests/tail-2/infloop-1 b/tests/tail-2/infloop-1
index ff6e712bf..580ec59a3 100755
--- a/tests/tail-2/infloop-1
+++ b/tests/tail-2/infloop-1
@@ -1,7 +1,7 @@
 #!/bin/sh
 # This test would fail with tail from pre-1.22i textutils.
 
-# Copyright (C) 1999, 2002 Free Software Foundation, Inc.
+# Copyright (C) 1999, 2002, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,7 +25,7 @@ fi
 
 tmp=tail-inf1.$$
 pwd=`pwd`
-trap "cd $pwd; rm -rf $tmp" 0 1 2 3 15
+trap 'cd "$pwd" && rm -rf $tmp' 0 1 2 3 15
 
 test_failure=0
 mkdir $tmp || test_failure=1
diff --git a/tests/tail-2/proc-ksyms b/tests/tail-2/proc-ksyms
index 9733a1cbc..ba9fccd6e 100755
--- a/tests/tail-2/proc-ksyms
+++ b/tests/tail-2/proc-ksyms
@@ -25,7 +25,7 @@ fi
 
 pwd=`pwd`
 tmp=proc-ksyms.$$
-trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap 'status=$?; cd "$pwd" && rm -rf $tmp && exit $status' 0
 trap '(exit $?); exit' 1 2 13 15
 
 fail=0
diff --git a/tests/tail-2/start-middle b/tests/tail-2/start-middle
index 3d3dd10da..92a939a9d 100755
--- a/tests/tail-2/start-middle
+++ b/tests/tail-2/start-middle
@@ -2,7 +2,7 @@
 # Verify that tail works even when it's reading from a file
 # that is not at its beginning.  Based on a report from John Roll.
 
-# Copyright (C) 2001, 2002, 2004 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2004, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,7 +26,7 @@ fi
 
 pwd=`pwd`
 tmp=tail-mid.$$
-trap 'status=$?; cd $pwd; rm -rf $tmp && exit $status' 0
+trap 'status=$?; cd "$pwd" && rm -rf $tmp && exit $status' 0
 trap '(exit $?); exit' 1 2 13 15
 
 framework_failure=0
diff --git a/tests/tail-2/tail-n0f b/tests/tail-2/tail-n0f
index c5692dccc..298fca4b4 100755
--- a/tests/tail-2/tail-n0f
+++ b/tests/tail-2/tail-n0f
@@ -2,7 +2,7 @@
 # Make sure that `tail -n0 -f' and `tail -c0 -f' sleep
 # rather than doing what amounted to a busy-wait.
 
-# Copyright (C) 2003 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2006 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -41,7 +41,7 @@ kill $pid
 
 pwd=`pwd`
 t0=`echo "$0"|sed 's,.*/,,'`.tmp; tmp=$t0/$$
-trap 'status=$?; cd $pwd; chmod -R u+rwx $t0; rm -rf $t0 && exit $status' 0
+trap 'status=$?; cd "$pwd" && chmod -R u+rwx $t0 && rm -rf $t0 && exit $status' 0
 trap '(exit $?); exit $?' 1 2 13 15
 
 framework_failure=0