From eb26f9fb20a04e483e65da189530bd8be6e56b60 Mon Sep 17 00:00:00 2001
From: Taiki Endo <te316e89@gmail.com>
Date: Mon, 1 Apr 2024 09:46:48 +0900
Subject: [PATCH] tools: Update tidy.sh

---
 tools/tidy.sh | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/tools/tidy.sh b/tools/tidy.sh
index ad6765c06..42b91e514 100755
--- a/tools/tidy.sh
+++ b/tools/tidy.sh
@@ -122,8 +122,9 @@ if [[ -n "$(git ls-files '*.rs')" ]]; then
         echo "${new}" >"${lib}"
         check_diff "${lib}"
     done
-    # Make sure that public Rust crates don't contain executables.
-    failed_files=''
+    # Make sure that public Rust crates don't contain executables and binaries.
+    executables=''
+    binaries=''
     metadata=$(cargo metadata --format-version=1 --no-deps)
     has_public_crate=''
     for id in $(jq <<<"${metadata}" '.workspace_members[]'); do
@@ -140,7 +141,7 @@ if [[ -n "$(git ls-files '*.rs')" ]]; then
         has_public_crate='1'
     done
     if [[ -n "${has_public_crate}" ]]; then
-        info "checking file permissions"
+        info "checking public crates don't contain executables and binaries"
         if [[ -f Cargo.toml ]]; then
             root_manifest=$(cargo locate-project --message-format=plain --manifest-path Cargo.toml)
             root_pkg=$(jq <<<"${metadata}" ".packages[] | select(.manifest_path == \"${root_manifest}\")")
@@ -167,13 +168,24 @@ if [[ -n "$(git ls-files '*.rs')" ]]; then
                 .* | tools/*) continue ;;
             esac
             if [[ -x "${p}" ]]; then
-                failed_files+="${p}"$'\n'
+                executables+="${p}"$'\n'
+            fi
+            # Use diff instead of file because file treats an empty file as a binary
+            # https://unix.stackexchange.com/questions/275516/is-there-a-convenient-way-to-classify-files-as-binary-or-text#answer-402870
+            if (diff .gitattributes "${p}" || true) | grep -q '^Binary file'; then
+                binaries+="${p}"$'\n'
             fi
         done
-        if [[ -n "${failed_files}" ]]; then
-            error "file-permissions-check failed: executable should be in tools/ directory"
+        if [[ -n "${executables}" ]]; then
+            error "file-permissions-check failed: executables are only allowed to be present in directories that are excluded from crates.io"
+            echo "======================================="
+            echo -n "${executables}"
+            echo "======================================="
+        fi
+        if [[ -n "${binaries}" ]]; then
+            error "file-permissions-check failed: binaries are only allowed to be present in directories that are excluded from crates.io"
             echo "======================================="
-            echo -n "${failed_files}"
+            echo -n "${binaries}"
             echo "======================================="
         fi
     fi