[Lunar-commits] r20278 - lunar/trunk/var/lib/lunar/functions

[Auke Kok]

Author: sofar
Date: 2006-05-31 15:39:12 +0000 (Wed, 31 May 2006)
New Revision: 20278

Modified:
   lunar/trunk/var/lib/lunar/functions/modules.lunar
Log:
Fixing up some semi-broken core functions to spot sections and modules properly inside zlocal/...


Modified: lunar/trunk/var/lib/lunar/functions/modules.lunar
===================================================================
--- lunar/trunk/var/lib/lunar/functions/modules.lunar	2006-05-31 15:32:40 UTC (rev 20277)
+++ lunar/trunk/var/lib/lunar/functions/modules.lunar	2006-05-31 15:39:12 UTC (rev 20278)
@@ -28,10 +28,11 @@
 # usage    : list_sections
 # purpose  : list the moonbase sections, filter out the specific files
 list_sections() {
-  debug_msg "list_sections ($@)"
-  check_module_index
-  cut -d: -f2 < $MODULE_INDEX | sort | uniq
-  return 0
+	debug_msg "list_sections ($@)"
+	check_module_index
+	cut -d: -f2 < $MODULE_INDEX | sort | uniq
+	find $MOONBASE/zlocal -name DETAILS | sed "s:^$MOONBASE\/::g;s:\/[^\/]*\/DETAILS$::g" | sort | uniq
+	return 0
 }
 
 
@@ -39,19 +40,26 @@
 # usage    : list_modules $SECTION
 # purpose  : list the modules in a section, filter out the specific files
 list_modules() {
-  debug_msg "list_modules ($@)"
-  if [[ -z "$1" ]] ; then
-    error_message "${PROBLEM_COLOR}list_modules(): no SECTION defined!${DEFAULT_COLOR}"
-    exit 1
-  fi
+	debug_msg "list_modules ($@)"
+	if [[ -z "$1" ]] ; then
+		error_message "${PROBLEM_COLOR}list_modules(): no SECTION defined!${DEFAULT_COLOR}"
+		exit 1
+	fi
 
-  if ! grep -q ":$1$" $MODULE_INDEX ; then
-    error_message "${PROBLEM_COLOR}list_modules(): no such section \"$1\"!${DEFAULT_COLOR}"
-    exit 1
-  fi
+	if [[ ! -d $MOONBASE/$1 ]] ; then
+		error_message "${PROBLEM_COLOR}list_modules(): no such section \"$1\"!${DEFAULT_COLOR}"
+		exit 1
+	fi
 
-  grep ":$1$" $MODULE_INDEX | cut -d: -f1
-  return 0
+	if grep -q ":$1$" $MODULE_INDEX; then
+		grep ":$1$" $MODULE_INDEX | cut -d: -f1
+		return 0
+	else
+	 (
+		 cd $MOONBASE/$1
+		 find . -maxdepth 2 -name DETAILS -type f | sed 's/\.\///g;s/\/DETAILS$//g'
+	 )
+	fi
 }
 
 
@@ -59,11 +67,11 @@
 # usage    : list_moonbase
 # purpose  : returns the names of all modules in moonbase
 list_moonbase() {
-  local SECTION
-  debug_msg "list_moonbase ($@)"
-  for SECTION in $(list_sections) ; do
-    list_modules $SECTION
-  done				
+	local SECTION
+	debug_msg "list_moonbase ($@)"
+	for SECTION in $(list_sections) ; do
+		list_modules $SECTION
+	done
 }
 
 
@@ -71,8 +79,8 @@
 # usage    : list_installed
 # purpose  : return a list of installed (or held) modules
 list_installed() {
-  debug_msg "list_installed ($@)"
-  grep -e ":installed:" -e ":held:" $MODULE_STATUS | cut -d: -f1 | sort
+	debug_msg "list_installed ($@)"
+	grep -e ":installed:" -e ":held:" $MODULE_STATUS | cut -d: -f1 | sort
 }