tracefile: single char dir (/a/) processed correctly.
This commit is contained in:
parent
60744cc445
commit
1111353240
|
@ -14,6 +14,8 @@ export -f doit
|
|||
|
||||
# Test 2 char dir
|
||||
mkdir -p tt/tt
|
||||
# Test 1 char dir
|
||||
mkdir -p t/1/2/3
|
||||
parallel -vj1 doit \
|
||||
::: '' -l -u \
|
||||
::: tt/tt/../tt/test.img `pwd`/tt/tt/../tt/test.img | grep test.img
|
||||
::: tt/tt/../tt/test.img `pwd`/tt/tt/../tt/test.img t/1/../1/2/3/test.img `pwd`/t/1/../1/2/3/test.img | grep test.img
|
||||
|
|
|
@ -279,10 +279,10 @@ while(<IN>) {
|
|||
my $addinfo = $5;
|
||||
# Relative to $dir
|
||||
$file =~ s:^([^/]):$dir/$1:;
|
||||
$file =~ s:/./:/:g; # /./ => /
|
||||
$file =~ s:/\./:/:g; # /./ => /
|
||||
$file =~ s:/[^/]+/\.\./:/:g; # /foo/../ => /
|
||||
# Match files in $PWD or starting with ./
|
||||
my $local = ($file =~ m<^(\Q$ENV{'PWD'}\E|\./)>);
|
||||
my $local = defined $ENV{'PWD'} && ($file =~ m<^(\Q$ENV{'PWD'}\E|\./)>);
|
||||
my $read = readfunc($function,$addinfo);
|
||||
my $write = writefunc($function,$addinfo);
|
||||
my $print = 1;
|
||||
|
|
2
vid/vid
2
vid/vid
|
@ -103,6 +103,8 @@ update_list() {
|
|||
-type f -printf '%s\t%p\n') |
|
||||
# Sort by size
|
||||
sort -rn |
|
||||
# Uniq
|
||||
uniq |
|
||||
# Remove size column
|
||||
perl -pe 's/^\S+\t//' > "$vidlist".$$
|
||||
# Replace old vidlist with new
|
||||
|
|
Loading…
Reference in a new issue