чување 3d57b6b04ea2e27e7fc9d3ee01a552de7b2de1fd родитељ ebfb22d88354fd3c9bc01ccee6560af242a710cc Аутор: Страхиња Радић <contact@strahinja.org> Датум: Wed, 16 Aug 2023 18:19:45 +0200 Avoid sed -z Signed-off-by: Страхиња Радић <contact@strahinja.org> Diffstat:
| M | transpose | | | 2 | +- |
| M | tsvedit | | | 5 | ++--- |
| M | tsvins | | | 9 | ++++----- |
измењених датотека: 3, додавања: 7(+), брисања: 9(-)
diff --git a/transpose b/transpose @@ -47,7 +47,7 @@ do cut -f$colno $tmpf_complete | paste -s colno=$(( colno + 1 )) if [ $max_tabs -eq 0 ] || \ - [ -z "$(cut -f${colno}- $tmpf_complete | sed -z 's/\n//g')" ] + [ -z "$(cut -f${colno}- $tmpf_complete | tr -d '\n')" ] then active=0 fi diff --git a/tsvedit b/tsvedit @@ -58,9 +58,8 @@ head -n$((lineno-1)) "${inputfile}" > "$tmpf" head -n"$lineno" "${inputfile}" | tail -n1; } | transpose - \ | sed 's/\t/\n/g' \ | vipe \ - | sed '/^#/d' \ - | sed -z -e's/\([^\n\t]*\)\n/\1\t/g' \ - | sed -z -e's/\t$/\n/g' >> "$tmpf" + | sed '/^#/d;s/\([^\t]*\)$/\1\t/g' | tr -d '\n' \ + | sed 's/\t$/\n/g' >> "$tmpf" tail +$((lineno+1)) "${inputfile}" >> "$tmpf" if diff "$tmpf" "${inputfile}" >/dev/null 2>&1; then diff --git a/tsvins b/tsvins @@ -49,13 +49,12 @@ if [ "${lines}" -gt 0 ]; then | transpose - \ | sed -e 's/\t/\n/g' \ | vipe --suffix tsv \ - | sed -e '/^#/d' \ - | sed -z -e's/\([^\n\t]*\)\n/\1\t/g' \ - | sed -z -e's/\t$/\n/g' >> "$tmpf" + | sed '/^#/d;s/\([^\t]*\)$/\1\t/g' | tr -d '\n' \ + | sed 's/\t$/\n/g' >> "$tmpf" else vipe --suffix tsv </dev/null | \ - sed -z -e's/\([^\n\t]*\)\n/\1\t/g' | \ - sed -z -e's/\t$/\n/g' >> "$tmpf" + sed 's/\([^\t]*\)$/\1\t/g' | tr -d '\n' \ + | sed 's/\t$/\n/g' >> "$tmpf" fi if [ $# -eq 2 ]; then tail +$((lineno + 1)) -- "${inputfile}" >> "$tmpf"