Changeset - r353:f8832dc16d45
« 351:2593e1
354:3e906e »
gravatar
kpeter (Peter Kovacs)
kpeter@inf.elte.hu
Use standard error/warning message format in the unifier script
0 1 0
default
1 file changed with 30 insertions and 12 deletions:
scripts/unify-sources.sh
30
12
↑ Collapse diff ↑
scripts/unify-sources.sh
Ignore white space 6 line context
... ... 
@@ -86,25 +86,35 @@
86 86 
}
87 87 

			




	88
	88
	
		
function check_action() {


			




	
	89
	
		
    if [ "$3" == 'tabs' ]


			




	
	90
	
		
    then


			




	
	91
	
		
        PATTERN=$(echo -e '\t')


			




	
	92
	
		
    elif [ "$3" == 'trailing spaces' ]


			




	
	93
	
		
    then


			




	
	94
	
		
        PATTERN='\ +$'


			




	
	95
	
		
    else


			




	
	96
	
		
        PATTERN='*'


			




	
	97
	
		
    fi


			




	
	98
	
		

			




	89
	99
	
		
    if ! diff -q $1 $2 >/dev/null


			




	90
	100
	
		
    then


			




	91
	
	
		
	echo


			




	92
	
	
		
	echo -n "      $3 failed at line(s): "


			




	93
	
	
		
	echo -n $(diff $1 $2 | grep '^[0-9]' | sed "s/^\(.*\)c.*$/ \1/g" | 


			




	94
	
	
		
	          sed "s/,/-/g" | paste -s -d',')


			




	95
	
	
		
	FAILED=YES


			




	
	101
	
		
        if [ "$PATTERN" == '*' ]


			




	
	102
	
		
        then


			




	
	103
	
		
            diff $1 $2 | grep '^[0-9]' | sed "s|^\(.*\)c.*$|$2:\1: check failed: $3|g" |


			




	
	104
	
		
              sed "s/:\([0-9]*\),\([0-9]*\):\(.*\)$/:\1:\3 (until line \2)/g"


			




	
	105
	
		
        else


			




	
	106
	
		
            grep -n -E "$PATTERN" $2 | sed "s|^\([0-9]*\):.*$|$2:\1: check failed: $3|g"


			




	
	107
	
		
        fi


			




	
	108
	
		
        FAILED=YES


			




	96
	109
	
		
    fi


			




	97
	110
	
		
}


			




	98
	111
	
		

			




	99
	112
	
		
function check_warning() {


			




	100
	
	
		
    echo


			




	101
	113
	
		
    if [ "$2" == 'long lines' ]


			




	102
	114
	
		
    then


			




	103
	
	
		
        echo -n "      $2 warning at line(s): "


			




	104
	
	
		
        echo -n $(grep -n -E '.{81,}' $1 | sed "s/^\([0-9]*\)/ \1\t/g" | 


			




	105
	
	
		
                  cut -f 1 | paste -s -d',')


			




	
	115
	
		
        grep -n -E '.{81,}' $1 | sed "s|^\([0-9]*\):.*$|$1:\1: warning: $2|g"


			




	106
	116
	
		
    else


			




	107
	
	
		
        echo -n "      $2 warning"


			




	
	117
	
		
        echo "$1: warning: $2"


			




	108
	118
	
		
    fi


			




	109
	119
	
		
    WARNED=YES


			




	110
	120
	
		
}


			




	...
	...
	
		
@@ -236,7 +246,12 @@


			




	236
	246
	
		
# process the file


			




	237
	247
	
		

			




	238
	248
	
		
function process_file() {


			




	239
	
	
		
    echo -n "    $ACTION $1..."


			




	
	249
	
		
    if [ "$ACTION" == 'update' ]


			




	
	250
	
		
    then


			




	
	251
	
		
        echo -n "    $ACTION $1..."


			




	
	252
	
		
    else


			




	
	253
	
		
        echo "	  $ACTION $1..."


			




	
	254
	
		
    fi


			




	240
	255
	
		

			




	241
	256
	
		
    CHECKING="header tabs spaces long_lines"


			




	242
	257
	
		

			




	...
	...
	
		
@@ -246,7 +261,10 @@


			




	246
	261
	
		
	"$check"_check $1


			




	247
	262
	
		
    done


			




	248
	263
	
		
    "$ACTION"_end $1


			




	249
	
	
		
    echo


			




	
	264
	
		
    if [ "$ACTION" == 'update' ]


			




	
	265
	
		
    then


			




	
	266
	
		
        echo


			




	
	267
	
		
    fi


			




	250
	268
	
		
}


			




	251
	269
	
		

			




	252
	270
	
		
function process_all {


			




        

    






    
    



    


    

     
    
0 comments (0 inline)