File tree 2 files changed +6
-3
lines changed
2 files changed +6
-3
lines changed Original file line number Diff line number Diff line change 30
30
exit (1 )
31
31
32
32
with open (file_name , 'r' ) as sourcefile :
33
- for x in range (0 ,4 ):
33
+ for x in range (0 ,len ( copyright_lines ) ):
34
34
# TODO add a check for empty files (dummy.js etc), as they cause the script to crash here
35
35
line = next (sourcefile )
36
36
line = line .rstrip ()
Original file line number Diff line number Diff line change @@ -12,9 +12,12 @@ if [ $? -ne 0 ]; then
12
12
PATH=/bin:/usr/bin:$PATH
13
13
fi
14
14
15
- ERRFILE=jenkins.check_eol.sh.err
15
+ ERRFILE=jenkins.check_copyright.sh.err
16
+ ERRFILETEMP=$ERRFILE .0
16
17
rm -f $ERRFILE
18
+ rm -f $ERRFILETEMP
17
19
20
+ echo " Check Copyright > Begin Checking..."
18
21
git diff --name-only ` git merge-base origin/master HEAD` HEAD |
19
22
grep -v -E ' \.git.*' |
20
23
grep -v -E ' \.xml$' |
@@ -29,7 +32,7 @@ git diff --name-only `git merge-base origin/master HEAD` HEAD |
29
32
grep -v -E ' \.def$' |
30
33
grep -v -E ' \.inc$' |
31
34
grep -v -E ' test/benchmarks/.*\.js$' |
32
- xargs -I % sh -c " echo Checking %; python jenkins.check_copyright.py % >> $ERRFILE "
35
+ xargs -I % sh -c " echo 'Check Copyright > Checking %' ; python jenkins.check_copyright.py % > $ERRFILETEMP ; if [ \$ ? -ne 0 ]; then cat $ERRFILETEMP >> $ERRFILE ; fi "
33
36
34
37
if [ -e $ERRFILE ]; then # if error file exists then there were errors
35
38
>&2 echo " --------------" # leading >&2 means echo to stderr
You can’t perform that action at this time.
0 commit comments