sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup temporary files in prepare-commit.sh

Browse Source
This commit is contained in:
Matthias Kuhn 2017-10-26 13:51:54 +02:00
parent 2383edbe00
commit a606c4685f
No known key found for this signature in database
GPG Key ID: A0E766808764D73F
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/astyle.sh
View File

@ -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

11
scripts/prepare-commit.sh
View File

@ -91,10 +91,8 @@ 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
@ -102,11 +100,10 @@ if [ -s "$ASTYLEDIFF" ]; 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