Improve Check EOL script.

dilijev · dilijev · commit c18573ec6cf8 · 2016-01-11T14:32:58.000-08:00
diff --git a/jenkins.check_file_eol.sh b/jenkins.check_file_eol.sh
@@ -4,8 +4,12 @@
 ERRFILE=jenkins.check_eol.sh.err
 ERRFILETEMP=$ERRFILE.0
 
+# display a helpful message for someone reading the log
+echo "Check EOL > Checking $1"
+
 if [ ! -e $1 ]; then # the file wasn't present; not necessarily an error
     echo "WARNING: file not found: $1"
+    exit 0 # don't report an error but don't run the rest of this file
 fi
 
 # We can't rely on dos2unix being installed, so simply grep for the CR octet 0x0d via xxd.
@@ -21,9 +25,10 @@ if [ $? -eq 0 ]; then # grep found matches ($?==0), so we found CR (0x0d) in the
     echo "Displaying first 10 lines of hex dump where CR (0x0d) was found:" >> $ERRFILE
     xxd -g 1 $1 | grep -n '0d ' > $ERRFILETEMP
     head -n 10 $ERRFILETEMP >> $ERRFILE
+
     # To help the user, display how many lines of hex output actually contained CR.
-    echo "Total hex dump lines containing CR (0x0d):" >> $ERRFILE
-    wc -l $ERRFILETEMP >> $ERRFILE
+    LINECOUNT=`python -c "file=open('$ERRFILETEMP', 'r'); print len(file.readlines())"`
+    echo "Total hex dump lines containing CR (0x0d): $LINECOUNT" >> $ERRFILE
     echo "--------------" >> $ERRFILE # same length as '--- ERRORS ---'
 fi
 
