Merge pull request #5461 from m-kuhn/less_temp_files

m-kuhn · web-flow · commit cfad3aa560c2 · 2018-05-08T10:35:15.000+02:00
Cleanup temporary files in prepare-commit.sh
diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -81,6 +81,7 @@ 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,22 +91,19 @@ for f in $MODIFIED; do
 
   cp $f $m
   ASTYLEPROGRESS=" [$i/$N]" astyle.sh $f
-  if diff -u $m $f >>$ASTYLEDIFF; then
-    # no difference found
-    rm $m
-  fi
+  diff -u $m $f >>$ASTYLEDIFF
+  rm $m
 done
 
 if [ -s "$ASTYLEDIFF" ]; then
   if tty -s; then
     # review astyle changes
     colordiff <$ASTYLEDIFF | less -r
   else
-    echo "Files changed (see $ASTYLEDIFF)"
+    echo "Files changed"
   fi
-else
-  rm $ASTYLEDIFF
 fi
+rm $ASTYLEDIFF
 
 
 # verify SIP files

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ 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"`
`84`	`85`	`}`
`85`	`86`
`86`	`87`	`for f in "$@"; do`