diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a8e0b9e6..8849afe2 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -61,7 +61,6 @@ jobs: cmake \ docbook-xml \ docbook2x \ - dos2unix \ gcc-multilib \ g++-multilib \ lcov \ diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 22bcb702..a52088ed 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -130,7 +130,6 @@ jobs: sudo apt-get install --yes --no-install-recommends -V \ cmake \ docbook2x \ - dos2unix \ gcc-multilib \ g++-multilib \ lcov \ diff --git a/Brewfile b/Brewfile index f4bf3b39..8f1ae516 100644 --- a/Brewfile +++ b/Brewfile @@ -2,7 +2,6 @@ brew "autoconf" brew "automake" brew "cmake" brew "docbook2x" -brew "dos2unix" brew "gcc" brew "gettext" brew "ghostscript" diff --git a/expat/fix-xmltest-log.sh b/expat/fix-xmltest-log.sh index 7981cf3b..9e0e5d03 100755 --- a/expat/fix-xmltest-log.sh +++ b/expat/fix-xmltest-log.sh @@ -32,10 +32,10 @@ set -e filename="${1:-tests/xmltest.log}" -dos2unix "${filename}" - -tempfile="$(mktemp)" -sed \ +sed -i.bak \ + -e '# convert DOS line endings to Unix without resorting to dos2unix' \ + -e $'s/\r//' \ + \ -e 's/^wine: Call .* msvcrt\.dll\._wperror, aborting$/ibm49i02.dtd: No such file or directory/' \ \ -e '/^wine: /d' \ @@ -46,5 +46,4 @@ sed \ -e '/^wine client error:/d' \ -e '/^In ibm\/invalid\/P49\/: Unhandled exception: unimplemented .\+/d' \ \ - "${filename}" > "${tempfile}" -mv "${tempfile}" "${filename}" + "${filename}"