Merge pull request #60445 from nathanfranke/minor-changes

small changes: improve OS.get_name classref, misc/scripts fixes, remove trailing quote

4 files changed, 9 insertions, 10 deletions

diff --git a/misc/scripts/black_format.sh b/misc/scripts/black_format.sh
index 99343f1c5a..f6fac58e50 100755
--- a/misc/scripts/black_format.sh
+++ b/misc/scripts/black_format.sh
@@ -11,13 +11,13 @@ black -l 120 $PY_FILES
 
 diff=$(git diff --color)
 
-# If no patch has been generated all is OK, clean up, and exit.
+# If no diff has been generated all is OK, clean up, and exit.
 if [ -z "$diff" ] ; then
     printf "Files in this commit comply with the black style rules.\n"
     exit 0
 fi
 
-# A patch has been created, notify the user, clean up, and exit.
+# A diff has been created, notify the user, clean up, and exit.
 printf "\n*** The following differences were found between the code "
 printf "and the formatting rules:\n\n"
 echo "$diff"
diff --git a/misc/scripts/clang_format.sh b/misc/scripts/clang_format.sh
index 6d19044d96..ba30ca8924 100755
--- a/misc/scripts/clang_format.sh
+++ b/misc/scripts/clang_format.sh
@@ -28,13 +28,13 @@ done
 
 diff=$(git diff --color)
 
-# If no patch has been generated all is OK, clean up, and exit.
+# If no diff has been generated all is OK, clean up, and exit.
 if [ -z "$diff" ] ; then
-    printf "Files in this commit comply with the clang-tidy style rules.\n"
+    printf "Files in this commit comply with the clang-format style rules.\n"
     exit 0
 fi
 
-# A patch has been created, notify the user, clean up, and exit.
+# A diff has been created, notify the user, clean up, and exit.
 printf "\n*** The following changes have been made to comply with the formatting rules:\n\n"
 echo "$diff"
 printf "\n*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"
diff --git a/misc/scripts/clang_tidy.sh b/misc/scripts/clang_tidy.sh
index e49f6ac9f4..63c1b10042 100755
--- a/misc/scripts/clang_tidy.sh
+++ b/misc/scripts/clang_tidy.sh
@@ -18,13 +18,13 @@ done
 
 diff=$(git diff --color)
 
-# If no patch has been generated all is OK, clean up, and exit.
+# If no diff has been generated all is OK, clean up, and exit.
 if [ -z "$diff" ] ; then
     printf "Files in this commit comply with the clang-tidy style rules.\n"
     exit 0
 fi
 
-# A patch has been created, notify the user, clean up, and exit.
+# A diff has been created, notify the user, clean up, and exit.
 printf "\n*** The following changes have been made to comply with the formatting rules:\n\n"
 echo "$diff"
 printf "\n*** Please fix your commit(s) with 'git commit --amend' or 'git rebase -i <hash>'\n"
diff --git a/misc/scripts/file_format.sh b/misc/scripts/file_format.sh
index 0c7235817d..c767d3f8a0 100755
--- a/misc/scripts/file_format.sh
+++ b/misc/scripts/file_format.sh
@@ -49,14 +49,13 @@ done
 
 diff=$(git diff --color)
 
-# If no patch has been generated all is OK, clean up, and exit.
+# If no diff has been generated all is OK, clean up, and exit.
 if [ -z "$diff" ] ; then
     printf "Files in this commit comply with the formatting rules.\n"
-    rm -f patch.patch
     exit 0
 fi
 
-# A patch has been created, notify the user, clean up, and exit.
+# A diff has been created, notify the user, clean up, and exit.
 printf "\n*** The following differences were found between the code "
 printf "and the formatting rules:\n\n"
 echo "$diff"