Merge lp:~jontai/openvista-gtm-integration/bug512995 into lp:openvista-gtm-integration

[Jon Tai]

[jeff.apple (jeff-apple)]

review: Approve

=== modified file 'scripts/usr/bin/ovimport'
--- scripts/usr/bin/ovimport	2010-02-09 23:23:02 +0000
+++ scripts/usr/bin/ovimport	2010-02-10 00:32:14 +0000
@@ -165,10 +165,15 @@
     if [ -f "$globals" ]; then
         # FIXME: handle compressed files
 
-        if awk '{ if (NR == 3) { print $0; exit 0 } }' "$globals" | grep -F '=' > /dev/null; then
+        # second line ends with ZWR
+        if awk '{ if (NR == 2) { print $0; exit 0 } }' "$globals" | grep ' ZWR$' > /dev/null; then
             globals_format=ZWR
-        else
+        # third line starts with ^
+        elif awk '{ if (NR == 3) { print $0; exit 0 } }' "$globals" | grep '^^' > /dev/null; then
             globals_format=GO
+        else
+            echo "ovimport: $globals: Unrecognized file format" >&2
+            exit 3
         fi
 
         if head "$globals" | grep -E $'\r$' > /dev/null; then