zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

Browse Source 
Conflicts:
	src/postProcessing/functionObjects/field/nearWallFields/nearWallFields.C
This commit is contained in:
mattijs
2011-09-13 10:14:15 +01:00
parent 2d53acd410 27e9485e96
commit 906acdcdef
747 changed files with 32829 additions and 98339 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
bin/tools/pre-commit-hook
View File

@ -150,13 +150,17 @@ checkIllegalCode()
(*[Mm]akefile* | wmake/rules/*)
;;
(*)
# parse line numbers from grep output:
# <lineNr>: contents
lines=$(git grep -E -hn -e "$reBad" $scope"$f" |
sed -e 's@:.*@@' |
tr '\n' ' '
)
[ -n "$lines" ] && echo "$Indent$f -- lines: $lines"
fileType=`file -b $f`
if [ "$fileType" != "data" ]
then
# parse line numbers from grep output:
# <lineNr>: contents
lines=$(git grep -E -hn -e "$reBad" $scope"$f" |
sed -e 's@:.*@@' |
tr '\n' ' '
)
[ -n "$lines" ] && echo "$Indent$f -- lines: $lines"
fi
;;
esac
done
@ -274,7 +278,7 @@ checkCopyright()
for f in $fileList
do
sYear=`grep "Copyright.*OpenFOAM" $f | sed 's/[^0-9]//g'`
if [ "$year" != "" ] && [ "$year" != "$sYear" ]; then
if [ "$sYear" != "" ] && [ "$year" != "$sYear" ]; then
echo "Updated copyright for: $f"
sed -i "s/$sYear OpenFOAM/$year OpenFOAM/g" $f
fi