Index: openacs-4/packages/acs-lang/bin/check-catalog.sh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-lang/bin/check-catalog.sh,v
diff -u -N -r1.5 -r1.6
--- openacs-4/packages/acs-lang/bin/check-catalog.sh	29 Oct 2002 17:58:27 -0000	1.5
+++ openacs-4/packages/acs-lang/bin/check-catalog.sh	1 Nov 2002 20:53:11 -0000	1.6
@@ -34,21 +34,23 @@
 
     # Check that all message lookups in tcl files have entries in the message catalog
     for tcl_message_key in $(find -iname '*.tcl'|xargs ${script_path}/mygrep \
-                             '(?ms)\[_\s+(?:\[ad_conn locale\]\s+)?"?${package_key}\.([a-zA-Z0-9_\.]+)"?')
+                             "(?ms)\[_\s+(?:\[ad_conn locale\]\s+)?\"?${package_key}\.([a-zA-Z0-9_\.]+)\"?")
     do 
-        grep -L $tcl_message_key catalog/${package_key}.en_US.ISO-8859-1.xml \
+        egrep -q "<msg[[:space:]]+key=\"$tcl_message_key\"" catalog/${package_key}.en_US.ISO-8859-1.xml \
           || \
         echo "Warning: key $tcl_message_key not in catalog file" 
     done
 }
 
 check_adp_file_lookups_are_in_catalog() {
 
+    catalog_file=catalog/${package_key}.en_US.ISO-8859-1.xml
+
     # Check that all message lookups in adp and info files are in the catalog file
     for adp_message_key in $(find -regex '.*\.\(info\|adp\)'|xargs ${script_path}/mygrep \
-                            '#${package_key}\.([a-zA-Z0-9_\.]+)#')
+                            "#${package_key}\.([a-zA-Z0-9_\.]+)#")
     do 
-        grep -L $adp_message_key catalog/${package_key}.en_US.ISO-8859-1.xml \
+        egrep -q "<msg[[:space:]]+key=\"$adp_message_key\"" $catalog_file \
           || \
         echo "Warning: key $adp_message_key not in catalog file"
     done