@@ -72,7 +72,7 @@ cp /dev/null $tmp/br_stderr # Setup map and reduce as parts of a pipeline [[ -n "$map" ]] && map="| $map 2>>$tmp/br_stderr" [[ $filenames == true ]] && map="| xargs -n1 \ - sh -c 'zcat \$0 2>/dev/null || cat \$0' 2>>$tmp/br_stderr $map" + sh -c 'zcat \$0 2>>$tmp/br_stderr || cat \$0 2>>$tmp/br_stderr' $map" [[ -n "$reduce" ]] && reduce="| $reduce 2>>$tmp/br_stderr" jobid="$(uuidgen)" @@ -118,8 +118,11 @@ done # Create the command to produce input if [[ -d "$input" ]]; then input="find $input -type f |" + [[ $filenames == false ]] && input="$input xargs -n1 \ + sh -c 'zcat \$0 2>>$tmp/br_stderr || cat \$0 2>>$tmp/br_stderr' |" elif [[ -f "$input" ]]; then - input="pv $input |" + input="sh -c 'zcat $input 2>>$tmp/br_stderr \ + || cat $input 2>>$tmp/br_stderr' |" else input= fi br 75f3292e78a58ecb9b02152c174eab6fd046d55b d9bce588d650bf2b4e07e1a5a7d18a800c4f26e8 Richard Crowley r@rcrowley.org http://github.com/rcrowley/bashreduce/commit/186e28e7954dd162ae4cf79bac46d2c191a64643 186e28e7954dd162ae4cf79bac46d2c191a64643 2009-07-13T17:14:10-07:00 2009-07-13T17:14:10-07:00 Merge branch 'master' of git@github.com:rcrowley/bashreduce 0b0e08ac210124a37c32f8337601be192427b924 Richard Crowley r@rcrowley.org