Revert "Merge pull request #5461 from m-kuhn/less_temp_files"

This reverts commit cfad3aa560c2d11e5271fc2ac64d82aba9f7b5a0, reversing
changes made to cdca7084c44d9d12d2ee835afff8577222262764.

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

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