Use grep to implement verify-line-endings

rust-lang · May 27, 2024 · 7a847fc · 7a847fc
1 parent f6e4703
commit 7a847fc
Showing 1 changed file with 11 additions and 11 deletions.
diff --git a/src/ci/scripts/verify-line-endings.sh b/src/ci/scripts/verify-line-endings.sh
@@ -4,21  4,21 @@
 # We check both in rust-lang/rust and in a submodule to make sure both are
 # accurate. Submodules are checked out significantly later than the main
 # repository in this script, so settings can (and do!) change between then.
-#
-# Linux (and maybe macOS) builders don't currently have dos2unix so just only
-# run this step on Windows.
 
 set -euo pipefail
 IFS=$'\n\t'
 
 source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"
 
-if isWindows; then
-    # print out the git configuration so we can better investigate failures in
-    # the following
-    git config --list --show-origin
-    dos2unix -ih Cargo.lock src/tools/rust-installer/install-template.sh
-    endings=$(dos2unix -ic Cargo.lock src/tools/rust-installer/install-template.sh)
-    # if endings has non-zero length, error out
-    if [ -n "$endings" ]; then exit 1 ; fi
 # print out the git configuration so we can better investigate failures in
 # the following
 git config --list --show-origin
 # -U is necessary on Windows to stop grep automatically converting the line ending
 endings=$(grep -Ul $(printf '\r$') Cargo.lock src/tools/cargo/Cargo.lock) || true
 # if endings has non-zero length, error out
 if [[ -n $endings ]]; then
     echo "Error: found DOS line endings"
     # Print the files with DOS line endings
     echo "$endings"
     exit 1
 fi