Changeset 2589

Timestamp:

Mar 9, 2006, 2:36:17 AM (19 years ago)

Author:

bird

Message:

use iso time for ls. delete \r.

File:

• trunk/coreutils/tests/mv/part-symlink (modified) (2 diffs)

trunk/coreutils/tests/mv/part-symlink

@@ -98 +98 @@
           # and put brackets around the output.
           test -s .err && {
-            echo '[' | tr -d '\n'
+            echo '[' | tr -d '\r\n' # bird
             sed 's/^[^:][^:]*\(..\):/\1:/;s,'$other_partition_tmpdir/,, .err
-            echo ']' | tr -d '\n'
+            echo ']' | tr -d '\r\n' # bird
             }
           # Strip off all but the file names.
           # Remove any site-dependent part of each file name.
-          ls="`ls -gG --ignore=.err . \
+          ls="`ls -gG  --time-style=iso --ignore=.err . \
               | sed \
                   -e '/^total /d' \
                   -e s,$other_partition_tmpdir/,, \
                   -e s,$pwd_tmp/,, \
-                  -e 's/^[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *//'`"
-          ls2="`cd $other_partition_tmpdir && ls -gG --ignore=.err . \
+                  -e 's/^[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *//'`" # bird: iso time - one word less
+          ls2="`cd $other_partition_tmpdir && ls -gG --time-style=iso --ignore=.err . \
               | sed \
                   -e '/^total /d' \
                   -e s,$other_partition_tmpdir/,, \
                   -e s,$pwd_tmp/,, \
-                  -e 's/^[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *//'`"
+                  -e 's/^[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *//'`" # bird: iso time
           echo "($ls) ($ls2)"
 
@@ -147 +147 @@
             done
           fi
-        ) | tr '\n' ' '
+        ) | tr '\n' ' ' | tr -d '\r' # bird
         echo
       ) | sed 's/  *$//'