From 034c3f0d75ae20f26bae551b9e5e323e92f1aa0e Mon Sep 17 00:00:00 2001
From: Denis Rouzaud <denis.rouzaud@gmail.com>
Date: Mon, 28 May 2018 09:28:58 -0400
Subject: [PATCH] Revert "Merge pull request #5461 from m-kuhn/less_temp_files"

This reverts commit cfad3aa560c2d11e5271fc2ac64d82aba9f7b5a0, reversing
changes made to cdca7084c44d9d12d2ee835afff8577222262764.
---
 scripts/astyle.sh         |  1 -
 scripts/prepare-commit.sh | 11 +++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/scripts/astyle.sh b/scripts/astyle.sh
index 3a8f459c1ad..53da84e3546 100755
--- a/scripts/astyle.sh
+++ b/scripts/astyle.sh
@@ -81,7 +81,6 @@ astyleit() {
 	scripts/doxygen_space.pl "$modified"
 	diff "$1" "$modified" >/dev/null || mv "$modified" "$1"
 	rm -f "$modified"
-	rm -f "$modified.sortinc"
 }
 
 for f in "$@"; do
diff --git a/scripts/prepare-commit.sh b/scripts/prepare-commit.sh
index 6ad8927cf4e..e98f7f553c1 100755
--- a/scripts/prepare-commit.sh
+++ b/scripts/prepare-commit.sh
@@ -91,8 +91,10 @@ for f in $MODIFIED; do
 
   cp $f $m
   ASTYLEPROGRESS=" [$i/$N]" astyle.sh $f
-  diff -u $m $f >>$ASTYLEDIFF
-  rm $m
+  if diff -u $m $f >>$ASTYLEDIFF; then
+    # no difference found
+    rm $m
+  fi
 done
 
 if [ -s "$ASTYLEDIFF" ]; then
@@ -100,10 +102,11 @@ if [ -s "$ASTYLEDIFF" ]; then
     # review astyle changes
     colordiff <$ASTYLEDIFF | less -r
   else
-    echo "Files changed"
+    echo "Files changed (see $ASTYLEDIFF)"
   fi
+else
+  rm $ASTYLEDIFF
 fi
-rm $ASTYLEDIFF
 
 
 # verify SIP files