Cleanup temporary files in prepare-commit.sh

m-kuhn · m-kuhn · commit a606c4685f84 · 2017-10-26T15:39:23.000+02:00
diff --git a/scripts/astyle.sh b/scripts/astyle.sh
@@ -68,6 +68,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
`@@ -68,6 +68,7 @@ astyleit() {`
`68`	`68`	`scripts/doxygen_space.pl "$modified"`
`69`	`69`	`diff "$1" "$modified" >/dev/null \|\| mv "$modified" "$1"`
`70`	`70`	`rm -f "$modified"`
	`71`	`+ rm -f "$modified.sortinc"`
`71`	`72`	`}`
`72`	`73`
`73`	`74`	`for f in "$@"; do`