# HG changeset patch # User Franz Glasner # Date 1727435932 -7200 # Node ID 3ac8fec90c963f7bd4507456a50bd7551d99a9a4 # Parent 971ac60a2f94d9844081c9a92a4d67755833e435 common.subr: FIX: Use \t instead of \t+ as input field separator for awk diff -r 971ac60a2f94 -r 3ac8fec90c96 share/local-bsdtools/common.subr --- a/share/local-bsdtools/common.subr Fri Sep 27 13:03:11 2024 +0200 +++ b/share/local-bsdtools/common.subr Fri Sep 27 13:18:52 2024 +0200 @@ -407,7 +407,7 @@ if [ -x "${JQ}" ]; then /sbin/mount -t zfs -p --libxo=json,no-locale \ | LC_ALL=C.UTF-8 "${JQ}" -r $'.mount.fstab[] | [.device, .mntpoint, .fstype, .opts, .dump, .pass] | @tsv ' \ - | LC_ALL=C.UTF-8 /usr/bin/awk -F $'\\t+' -v OFS=$'\t' -v ds1="${_dsname}" -v ds2="${_dsname}/" $'{ if (($1 == ds1) || (index($1, ds2) == 1)) { print $1, $2, $3, $4, $5, $6; } }' \ + | LC_ALL=C.UTF-8 /usr/bin/awk -F $'\\t' -v OFS=$'\t' -v ds1="${_dsname}" -v ds2="${_dsname}/" $'{ if (($1 == ds1) || (index($1, ds2) == 1)) { print $1, $2, $3, $4, $5, $6; } }' \ | LC_ALL=C.UTF-8 /usr/bin/sort --field-separator=$'\t' --key=2 ${_opt_reversed} else # Check for unexpected spaces @@ -488,7 +488,7 @@ if [ -x "${JQ}" ]; then /sbin/mount -p --libxo=json,no-locale \ | LC_ALL=C.UTF-8 "${JQ}" -r $'.mount.fstab[] | [.device, .mntpoint, .fstype, .opts, .dump, .pass] | @tsv ' \ - | LC_ALL=C.UTF-8 /usr/bin/awk -F $'\\t+' -v OFS=$'\t' -v mp1="${_mp1}" -v mp2="${_mp2}" $'{ if (($2 == mp1) || (index($2, mp2) == 1)) { print; } }' \ + | LC_ALL=C.UTF-8 /usr/bin/awk -F $'\\t' -v OFS=$'\t' -v mp1="${_mp1}" -v mp2="${_mp2}" $'{ if (($2 == mp1) || (index($2, mp2) == 1)) { print; } }' \ | LC_ALL=C.UTF-8 /usr/bin/sort --field-separator=$'\t' --key=2 ${_opt_reversed} else # Check for unexpected spaces