Improve unify-sources.sh (#186)
authorPeter Kovacs <kpeter@inf.elte.hu>
Sun, 30 Nov 2008 22:06:36 +0100
changeset 396c5f010a5647a
parent 395 0c5dd7ceda03
child 398 532f34ea9cf3
Improve unify-sources.sh (#186)
Errors can also be accepted when the script is used as a hg hook.
Sometimes it is useful (e.g. if someone else made the errors).
scripts/unify-sources.sh
     1.1 --- a/scripts/unify-sources.sh	Sun Nov 30 09:39:34 2008 +0000
     1.2 +++ b/scripts/unify-sources.sh	Sun Nov 30 22:06:36 2008 +0100
     1.3 @@ -130,14 +130,11 @@
     1.4      echo $FAILED_FILES out of $TOTAL_FILES files has been failed.
     1.5      echo $WARNED_FILES out of $TOTAL_FILES files triggered warnings.
     1.6  
     1.7 -    if [ $FAILED_FILES -gt 0 ]
     1.8 -    then
     1.9 -	return 1
    1.10 -    elif [ $WARNED_FILES -gt 0 ]
    1.11 +    if [ $WARNED_FILES -gt 0 -o $FAILED_FILES -gt 0 ]
    1.12      then
    1.13  	if [ "$WARNING" == 'INTERACTIVE' ]
    1.14  	then
    1.15 -	    echo -n "Are the files with warnings acceptable? (yes/no) "
    1.16 +	    echo -n "Are the files with errors/warnings acceptable? (yes/no) "
    1.17  	    while read answer
    1.18  	    do
    1.19  		if [ "$answer" == 'yes' ]
    1.20 @@ -147,7 +144,7 @@
    1.21  		then
    1.22  		    return 1
    1.23  		fi
    1.24 -		echo -n "Are the files with warnings acceptable? (yes/no) "
    1.25 +		echo -n "Are the files with errors/warnings acceptable? (yes/no) "
    1.26  	    done
    1.27  	elif [ "$WARNING" == 'WERROR' ]
    1.28  	then