Changeset 2426 for LMDZ5/trunk/tools

Timestamp:

Jan 26, 2016, 6:32:09 PM (9 years ago)

Author:

lguez

Message:

Make the script more robust.

File:

• LMDZ5/trunk/tools/diffdef.sh (modified) (2 diffs)

LMDZ5/trunk/tools/diffdef.sh

@@ -2 +2 @@
 # Author: Lionel GUEZ
 
-# This script compares files "*.def" other than "traceur.def" and
+# This script compares files "*.def" other than "*traceur.def" and
 # "out.def" in two directories.
 
@@ -44 +44 @@
   rm -f all.def
   echo "def files in $my_directory:"
-  ls !(traceur|out).def
+  ls !(*traceur|out).def
 
   # Concatenate and format the def files:
-  cat !(traceur|out).def | tr -d " " | grep -v -E '(^#|^!|INCLUDEDEF|^$)' \
+  cat !(*traceur|out).def | tr '\r' '\n' | tr -d " " \
+      | grep -v -E '(^#|^!|INCLUDEDEF|^$)' \
       | tr '[:lower:]' '[:upper:]' | sed 's/=[NF]$/=FALSE/' \
       | sed 's/=[YT]$/=TRUE/' | sort >all.def