diff --git a/fhem/contrib/pre-commit b/fhem/contrib/pre-commit index 0f7e4854c..779b5576f 100755 --- a/fhem/contrib/pre-commit +++ b/fhem/contrib/pre-commit @@ -12,9 +12,7 @@ my $arg="-t $txn"; #my $arg="-r $txn"; # local testing my @lang = ("EN", "DE"); my $exitCode = 0; -use constant TAGS => qw{ul li code b i u table tr td}; -use constant LINECHECK => qw{CHANGED}; - +use constant TAGS => qw{ul li code b i u td tr table}; my $log = `$svnlook log $arg $repos`; if($log !~ m/^.*:.*$/s) { @@ -32,23 +30,29 @@ foreach my $row (split("\n", $fList)) { chomp($row); my ($type, $fName) = split(" ", $row); next if($type eq "D"); - next if(!$fName || !grep($fName, LINECHECK) || $fName !~ m+FHEM/\d\d_(.*).pm$+); - my $modName = $1; + next if(!$fName); # check for 80 chars per line conformity - if(grep($fName, LINECHECK)) { - my $cCount = 0; + if($fName =~ m/CHANGED/) { + my ($cCount, $cLineNo, $lineNo) = (0,0,0); open(FILE, "$svnlook $arg cat $repos $fName|") || die("Cant svnlook cat $fName:$!\n"); while(my $l = ) { chomp $l; - $cCount = length($l) if(length($l) > $cCount); + $lineNo++; + if(length($l) > $cCount) { + $cCount = length($l); + $cLineNo = $lineNo; + } } close(FILE); - err $fName, "$fName: file has over 80 chars/line" if($cCount > 80); + err $fName, "$fName: file has over 80 chars/line in line $cLineNo" + if($cCount > 80); next; } - + + next if($fName !~ m+FHEM/\d\d_(.*).pm$+); + my $modName = $1; foreach my $lang (@lang) { my $suffix = ($lang eq "EN" ? "" : "_$lang"); my $tag;