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

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

Browse Source 
This reverts commit cfad3aa560c2d11e5271fc2ac64d82aba9f7b5a0, reversing
changes made to cdca7084c44d9d12d2ee835afff8577222262764.
This commit is contained in:
Denis Rouzaud 2018-05-28 09:28:58 -04:00
parent 4c3a9ef7be
commit 034c3f0d75
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/astyle.sh
View File

@ -81,7 +81,6 @@ astyleit() {
scripts/doxygen_space.pl "$modified" scripts/doxygen_space.pl "$modified"
diff "$1" "$modified" >/dev/null || mv "$modified" "$1" diff "$1" "$modified" >/dev/null || mv "$modified" "$1"
rm -f "$modified" rm -f "$modified"
rm -f "$modified.sortinc"
} }
for f in "$@"; do for f in "$@"; do

11
scripts/prepare-commit.sh
View File

@ -91,8 +91,10 @@ for f in $MODIFIED; do
cp $f $m cp $f $m
ASTYLEPROGRESS=" [$i/$N]" astyle.sh $f ASTYLEPROGRESS=" [$i/$N]" astyle.sh $f
diff -u $m $f >>$ASTYLEDIFF if diff -u $m $f >>$ASTYLEDIFF; then
rm $m # no difference found
rm $m
fi
done done
if [ -s "$ASTYLEDIFF" ]; then if [ -s "$ASTYLEDIFF" ]; then
@ -100,10 +102,11 @@ if [ -s "$ASTYLEDIFF" ]; then
# review astyle changes # review astyle changes
colordiff <$ASTYLEDIFF | less -r colordiff <$ASTYLEDIFF | less -r
else else
echo "Files changed" echo "Files changed (see $ASTYLEDIFF)"
fi fi
else
rm $ASTYLEDIFF
fi fi
rm $ASTYLEDIFF
# verify SIP files # verify SIP files