aboutsummaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2017-11-03 14:19:16 +1300
committerTom Ryder <tom@sanctum.geek.nz>2017-11-03 14:19:16 +1300
commit6527e0d74b2d62c9fd76d6ae357227887f89c4f1 (patch)
treed542cc6f42a9d898954491e871c07441814552cc /bin
parent0d81ae317ac088a67857245173d6e93fb8ef4bf1 (diff)
parent0b3aa702497fe3fa690a31998f3c7aedb96e5c73 (diff)
downloaddotfiles-6527e0d74b2d62c9fd76d6ae357227887f89c4f1.tar.gz
dotfiles-6527e0d74b2d62c9fd76d6ae357227887f89c4f1.zip
Merge branch 'feature/d2u-u2d-con...' into develop
* feature/d2u-u2d-consist: Make d2u(1df)/u2d(1df) like their stream analogues
Diffstat (limited to 'bin')
-rw-r--r--bin/d2u.sh2
-rw-r--r--bin/u2d.sh3
2 files changed, 2 insertions, 3 deletions
diff --git a/bin/d2u.sh b/bin/d2u.sh
index 22c8e16b..892c446b 100644
--- a/bin/d2u.sh
+++ b/bin/d2u.sh
@@ -16,7 +16,7 @@ for fn ; do
# $r within it to get a literal carriage return; the escape characters
# prescribed for ed(1) by POSIX are very limited
ed -s -- "$fn" <<EOF || ex=1
-g/$r\$/ s/$r\$//
+,s/$r\$//
w
EOF
done
diff --git a/bin/u2d.sh b/bin/u2d.sh
index 9f4e800a..31030341 100644
--- a/bin/u2d.sh
+++ b/bin/u2d.sh
@@ -16,8 +16,7 @@ for fn ; do
# $r within it to get a literal carriage return; the escape characters
# prescribed for ed(1) by POSIX are very limited
ed -s -- "$fn" <<EOF || ex=1
-g/[^$r]\$/ s/\$/$r/
-g/^\$/ s/\$/$r/
+,s/\$/$r/
w
EOF
done