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 -r1.2 -r1.3
--- openacs-4/packages/acs-lang/bin/check-catalog.sh	25 Oct 2002 14:40:39 -0000	1.2
+++ openacs-4/packages/acs-lang/bin/check-catalog.sh	28 Oct 2002 14:21:02 -0000	1.3
@@ -11,39 +11,83 @@
 #
 # @author Peter Marklund (peter@collaboraid.biz)
 
+### Functions start
+check_catalog_keys_have_lookups() {
+
+    # Check that all keys in the catalog file are either in tcl or adp or info files
+    for catalog_key in $(${script_path}/mygrep '<msg key="([^"]+)"' catalog/${package_key}.en_US.ISO-8859-1.xml) 
+    do 
+        find -iname '*.tcl' | xargs ${script_path}/mygrep \
+           "(?ms)\[_\s+(?:\[ad_conn locale\]\s+)?\"?${package_key}\.$catalog_key\"?" \
+         || \
+        find -regex '.*\.\(info\|adp\)' | xargs ${script_path}/mygrep \
+           "#${package_key}\.$catalog_key#" \
+         || \
+        echo "Warning key $catalog_key in catalog file not found in any adp or tcl file"
+    done
+}
+
+check_tcl_file_lookups_are_in_catalog() {
+
+    # 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_\.]+)"?')
+    do 
+        grep -L $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() {
+
+    # 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_\.]+)#')
+    do 
+        grep -L $adp_message_key catalog/${package_key}.en_US.ISO-8859-1.xml \
+          || \
+        echo "Warning: key $adp_message_key not in catalog file"
+    done
+}
+### Functions end
+
 script_path=$(dirname $(which $0))
+packages_dir="${script_path}/../../"
 
-export package_key=$1
-package_path="${script_path}/../../${package_key}"
+# Process arguments
+if [ "$#" == "0" ]; then
+    # No package provided - check all packages
+    for catalog_dir in $(find $package_dir -iname catalog -type d)
+    do
+        # Recurse with each package key that has a catalog dir
+        $0 $(basename $(dirname $catalog_dir))
+    done
 
+    exit 0
+
+elif [ "$#" == "1" ]; then
+    # Package key provided
+    export package_key=$1
+else
+    echo "$0: Error - invoked with more than one argument, this script only accepts one argument, exiting."
+    exit 1
+fi
+
+echo "$0: Starting check of package $package_key"
+
+# Check that the catalog file exists
+catalog_file_path="${packages_dir}${package_key}/catalog/${package_key}.en_US.ISO-8859-1.xml"
+if [ ! -e $catalog_file_path ]; then
+    echo "$0: Error - the file $catalog_file_path in package $package_key doesn't exist, exiting"
+    exit 1
+fi
+
+package_path="${script_path}/../../${package_key}"
 cd $package_path
 
-# Check that all keys in the catalog file are either in tcl or adp or info files
-for catalog_key in $(${script_path}/mygrep '<msg key="([^"]+)"' catalog/${package_key}.en_US.ISO-8859-1.xml) 
-do 
-  find -iname '*.tcl' | xargs ${script_path}/mygrep \
-    "(?ms)\[_\s+(?:\[ad_conn locale\]\s+)?\"?${package_key}\.$catalog_key\"?" \
-    || \
-  find -regex '.*\.\(info\|adp\)' | xargs ${script_path}/mygrep \
-    "#${package_key}\.$catalog_key#" \
-    || \
-  echo "Warning key $catalog_key in catalog file not found in any adp or tcl file"
-done
+check_catalog_keys_have_lookups $package_key
 
-# 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_\.]+)"?')
-do 
-    grep -L $tcl_message_key catalog/${package_key}.en_US.ISO-8859-1.xml \
-      || \
-    echo "Warning: key $tcl_message_key not in catalog file" 
-done
+check_tcl_file_lookups_are_in_catalog $package_key
 
-# 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_\.]+)#')
-do 
-    grep -L $adp_message_key catalog/${package_key}.en_US.ISO-8859-1.xml \
-      || \
-    echo "Warning: key $adp_message_key not in catalog file"
-done
+check_adp_file_lookups_are_in_catalog $package_key