Merge pull request #5461 from m-kuhn/less_temp_files

Cleanup temporary files in prepare-commit.sh
qgis · May 8, 2018 · cfad3aa · cfad3aa · 3nids · May 28, 2018
2 parents cdca708 + a606c46
commit cfad3aa
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
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