From f9fa751f290e0f6baa997c1e76d552b2947a965f Mon Sep 17 00:00:00 2001 From: mitchell <70453897+orbitalquark@users.noreply.github.com> Date: Wed, 16 Sep 2020 21:04:42 -0400 Subject: No need for "-e" in simple sed invocations. --- .github/workflows/release.yml | 2 +- scripts/osx/textadept_osx | 2 +- src/Dockerfile | 2 +- test/test.lua | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 103c2605..3928a215 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -71,7 +71,7 @@ jobs: version="${{ github.event.inputs.tag }}" if [[ -z $version ]]; then version=`ls -1 src/textadept_*.zip | head -1 | - sed -e 's/[^_]\+_\(.\+\)\.[^.]\+\.zip/\1/;'` + sed 's/[^_]\+_\(.\+\)\.[^.]\+\.zip/\1/;'` fi echo "::set-output name=version::$version" diff --git a/scripts/osx/textadept_osx b/scripts/osx/textadept_osx index 78a09679..0179923f 100755 --- a/scripts/osx/textadept_osx +++ b/scripts/osx/textadept_osx @@ -16,7 +16,7 @@ export PANGO_SYSCONFDIR="$bundle_res/etc" export CHARSETALIASDIR="$bundle_res/lib" # Strip out the argument added by macOS. -if [ x`echo "x$1" | sed -e "s/^x-psn_.*//"` == x ]; then shift 1; fi +if [ x`echo "x$1" | sed "s/^x-psn_.*//"` == x ]; then shift 1; fi # Source '~/.textadept/osx_env.sh' to set variables like $PATH when opening # Textadept.app from the Dock or the Finder. diff --git a/src/Dockerfile b/src/Dockerfile index b90faadc..89d9de9f 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -32,7 +32,7 @@ RUN echo "Building osxcross" \ && tar czf /opt/osxcross/tarballs/${sdk}.tar.gz ${sdk} \ && rm -r ${sdk}* \ && cd /opt/osxcross \ - && sed -i -e 's/I386_SUPPORTED=1/I386_SUPPORTED=0/;' build.sh \ + && sed -i 's/I386_SUPPORTED=1/I386_SUPPORTED=0/;' build.sh \ && UNATTENDED=1 SDK_VERSION="10.13" OSX_VERSION_MIN="10.6" ./build.sh RUN echo "Cleaning up" && rm -rf /opt/osxcross/build /opt/osxcross/tarballs/MacOSX* ENV PATH="$PATH:/opt/osxcross/target/bin" diff --git a/test/test.lua b/test/test.lua index 425bede6..5d6ddbc5 100644 --- a/test/test.lua +++ b/test/test.lua @@ -1909,7 +1909,7 @@ function test_editing_filter_through() assert_equal(buffer:get_text(), 'foo\nbar\nbaz\nquux\nfoobar\n') buffer:undo() buffer:set_sel(buffer:position_from_line(2) + 2, buffer.line_end_position[2]) - textadept.editing.filter_through('sed -e "s/o/O/g;"') + textadept.editing.filter_through('sed "s/o/O/g;"') assert_equal(buffer:get_text(), '3|baz\n1|fOO\n5|foobar\n1|foo\n4|quux\n2|bar\n') buffer:undo() buffer:set_sel(buffer:position_from_line(2), buffer:position_from_line(5)) -- cgit v1.2.3