Changeset 396:c5f010a5647a in lemon-main

Timestamp:

11/30/08 22:06:36 (16 years ago)

Author:

Peter Kovacs <kpeter@…>

Branch:

default

Phase:

public

Message:

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).

File:

• scripts/unify-sources.sh (modified) (2 diffs)

scripts/unify-sources.sh

@@ -131 +131 @@
     echo $WARNED_FILES out of $TOTAL_FILES files triggered warnings.
 
-    if [ $FAILED_FILES -gt 0 ]
-    then
-        return 1
-    elif [ $WARNED_FILES -gt 0 ]
+    if [ $WARNED_FILES -gt 0 -o $FAILED_FILES -gt 0 ]
     then
         if [ "$WARNING" == 'INTERACTIVE' ]
         then
-            echo -n "Are the files with warnings acceptable? (yes/no) "
+            echo -n "Are the files with errors/warnings acceptable? (yes/no) "
             while read answer
             do
@@ -148 +145 @@
                     return 1
                 fi
-                echo -n "Are the files with warnings acceptable? (yes/no) "
+                echo -n "Are the files with errors/warnings acceptable? (yes/no) "
             done
         elif [ "$WARNING" == 'WERROR' ]