Improve the way out of date modules are detected

diff --git a/jabber/module.info b/jabber/module.info
index 395e524..681aaa1 100644 (file)
--- a/jabber/module.info
+++ b/jabber/module.info
@@ -9,3 +9,4 @@ desc_ru_RU=
 longdesc=Configure the multi-protocol Jabber messaging server.
 cpan=1
 os_support=!windows
+nondefault=1

diff --git a/sentry/module.info b/sentry/module.info
index 4dc34fc..98201b9 100644 (file)
--- a/sentry/module.info
+++ b/sentry/module.info
@@ -10,3 +10,4 @@ desc_ru_RU=
 longdesc=Configure the portsentry, hostsentry and logcheck system security monitoring programs.
 readonly=1
 os_support=!windows
+nondefault=1

diff --git a/setup.sh b/setup.sh
index 6d367ef..f9e3447 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -77,7 +77,10 @@ fi
 
 # Validate source directory
 allmods=`cd "$srcdir"; echo */module.info | sed -e 's/\/module.info//g'`
-defaultallmods=`cd "$srcdir"; echo */module.info | grep -v jabber/module.info | grep -v sentry/module.info | sed -e 's/\/module.info//g'`
+defaultallmods=`cd "$srcdir"; echo */module.info | xargs grep -L nondefault=1 2>/dev/null | sed -e 's/\/module.info//g'`
+if [ "$defaultallmods" = "" ]; then
+       defaultallmods="$allmods"
+fi
 if [ "$allmods" = "" ]; then
        echo "ERROR: Failed to get module list"
        echo ""