Don't assume that 'ls' output is fixed-width.

2026-06-01 21:41:41 -04:00 · 2003-12-08 09:03:51 +00:00
parent a6616a3786
commit 710dca5363
1 changed files with 2 additions and 2 deletions
@@ -108,13 +108,13 @@ for copy in cp mv; do
 		  -e '/^total /d' \
 		  -e s,$other_partition_tmpdir/,, \
 		  -e s,$pwd_tmp/,, \
-		  -e 's/^......................................//'`"
+		  -e 's/^[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *//'`"
 	  ls2="`cd $other_partition_tmpdir && ls -gG --ignore=.err . \
 	      | sed \
 		  -e '/^total /d' \
 		  -e s,$other_partition_tmpdir/,, \
 		  -e s,$pwd_tmp/,, \
-		  -e 's/^......................................//'`"
+		  -e 's/^[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *[^ ]*  *//'`"
 	  echo "($ls) ($ls2)"

 	  # If the command failed, then it must not have changed the files.