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

3nids · 3nids · commit 034c3f0d75ae · 2018-05-28T09:28:58.000-04:00
This reverts commit cfad3aa, reversing changes made to cdca708.
diff --git 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
@@ -91,19 +91,22 @@ 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
   if tty -s; 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

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,6 @@ astyleit() {`
`81`	`81`	`scripts/doxygen_space.pl "$modified"`
`82`	`82`	`diff "$1" "$modified" >/dev/null \|\| mv "$modified" "$1"`
`83`	`83`	`rm -f "$modified"`
`84`		`- rm -f "$modified.sortinc"`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`for f in "$@"; do`