X-Git-Url: http://gitweb.michael.orlitzky.com/?p=nagios-mode.git;a=blobdiff_plain;f=utils%2Fparse_object_definitions;fp=utils%2Fparse_object_definitions;h=aaa6c314e3a154199f1ac9f6abf90dc9a8886bfe;hp=0d164a268f62183d80b45f335d8f6aa724e5215d;hb=88830b7fb9158f62b03876c3ed2c785706b2627d;hpb=af5407aaaf8e595e76c4713872e5a9d3e5027122

diff --git a/utils/parse_object_definitions b/utils/parse_object_definitions
index 0d164a2..aaa6c31 100755
--- a/utils/parse_object_definitions
+++ b/utils/parse_object_definitions
@@ -22,17 +22,15 @@ if [ ! -f "$INFILE" ]; then
     exit $EXIT_INPUT_FILE_DOESNT_EXIST
 fi
 
-# Grep grabs all of the "#define XODTEMPLATE_..." lines, except for
-# XODTEMPLATE_NONE, which ain't real.
-#
-# Sed removes the "XODTEMPLATE_" prefixes, then tr lowercases everything.
-#
-# Oh and we sort everything, add "define ", and surround each line with
-# quotes, because we can get away with it here.
-#
-grep --only-matching '[[:space:]]XODTEMPLATE_[[:alnum:]_]\{1,\}' "$INFILE" \
-    | grep -v 'XODTEMPLATE_NONE'                                           \
-    | sed 's/ XODTEMPLATE_//g'                                             \
-    | tr '[A-Z]' '[a-z]'                                                   \
-    | sort                                                                 \
-    | sed -e 's/^/\"define /g' -e 's/$/\"/g'
+# Sed grabs all of the "#define XODTEMPLATE_FOO" lines, pulls out the
+# FOO part, and then prints "define FOO", surrounded in
+# quotes. Afterwards we prune the two lines corresponding to
+# XODTEMPLATE_NULL and XODTEMPLATE_NONE which do not correspond to
+# real object types. Finally we lowercase everything with tr, and sort
+# the result.
+XOD_REGEX='#define[[:space:]]\{1,\}XODTEMPLATE_\([^[:space:]]\{1,\}\)[[:space:]]\{1,\}.*'
+
+sed -n "s/${XOD_REGEX}/\"define \1\"/p" "${INFILE}" \
+  | sed '/define NULL\|NONE/d'                      \
+  | tr '[A-Z]' '[a-z]'                              \
+  | sort                                            \