Changes in / [342:3e906e6c08a9:340:0badf3bb38c2] in lemon-1.1

File:

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

scripts/unify-sources.sh

@@ -87 +87 @@
 
 function check_action() {
-    if [ "$3" == 'tabs' ]
-    then
-        PATTERN=$(echo -e '\t')
-    elif [ "$3" == 'trailing spaces' ]
-    then
-        PATTERN='\ +$'
+    if ! diff -q $1 $2 >/dev/null
+    then
+        echo
+        echo -n "      $3 failed at line(s): "
+        echo -n $(diff $1 $2 | grep '^[0-9]' | sed "s/^\(.*\)c.*$/ \1/g" | 
+                  sed "s/,/-/g" | paste -s -d',')
+        FAILED=YES
+    fi
+}
+
+function check_warning() {
+    echo
+    if [ "$2" == 'long lines' ]
+    then
+        echo -n "      $2 warning at line(s): "
+        echo -n $(grep -n -E '.{81,}' $1 | sed "s/^\([0-9]*\)/ \1\t/g" | 
+                  cut -f 1 | paste -s -d',')
     else
-        PATTERN='*'
-    fi
-
-    if ! diff -q $1 $2 >/dev/null
-    then
-        if [ "$PATTERN" == '*' ]
-        then
-            diff $1 $2 | grep '^[0-9]' | sed "s|^\(.*\)c.*$|$2:\1: check failed: $3|g" |
-              sed "s/:\([0-9]*\),\([0-9]*\):\(.*\)$/:\1:\3 (until line \2)/g"
-        else
-            grep -n -E "$PATTERN" $2 | sed "s|^\([0-9]*\):.*$|$2:\1: check failed: $3|g"
-        fi
-        FAILED=YES
-    fi
-}
-
-function check_warning() {
-    if [ "$2" == 'long lines' ]
-    then
-        grep -n -E '.{81,}' $1 | sed "s|^\([0-9]*\):.*$|$1:\1: warning: $2|g"
-    else
-        echo "$1: warning: $2"
+        echo -n "      $2 warning"
     fi
     WARNED=YES
@@ -247 +237 @@
 
 function process_file() {
-    if [ "$ACTION" == 'update' ]
-    then
-        echo -n "    $ACTION $1..."
-    else
-        echo "    $ACTION $1..."
-    fi
+    echo -n "    $ACTION $1..."
 
     CHECKING="header tabs spaces long_lines"
@@ -262 +247 @@
     done
     "$ACTION"_end $1
-    if [ "$ACTION" == 'update' ]
-    then
-        echo
-    fi
+    echo
 }