[Lunar-commits] CVS: theedge/var/lib/lunar/functions build.lunar, 1.29, 1.30 plugins.lunar, 1.6, 1.7

[Auke Kok]

Update of /var/cvs/lunar/theedge/var/lib/lunar/functions
In directory espresso.foo-projects.org:/home/sofar/active/theedge/var/lib/lunar/functions

Modified Files:
	build.lunar plugins.lunar 
Log Message:
Fix for postbuild not installing plugins: force installation


Index: build.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/build.lunar,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- build.lunar	30 Mar 2005 11:25:53 -0000	1.29
+++ build.lunar	6 Apr 2005 15:18:24 -0000	1.30
@@ -261,7 +261,7 @@
   } | tee -a $C_LOG
   
   install_initd
-  update_plugin $MODULE
+  update_plugin $MODULE install
 
   devoke_installwatch
   ldconfig

Index: plugins.lunar
===================================================================
RCS file: /var/cvs/lunar/theedge/var/lib/lunar/functions/plugins.lunar,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- plugins.lunar	30 Mar 2005 11:25:53 -0000	1.6
+++ plugins.lunar	6 Apr 2005 15:18:24 -0000	1.7
@@ -69,12 +69,12 @@
 	# scan module for plugins, and add/delete them as needed
 	if SECTION=$(find_section $1); then
 		if [ -d $MOONBASE/$SECTION/$1/plugin.d ]; then
-			if ! module_installed $1 ; then
+			if [ "$2" == "install" ] ; then
 				for PLUGIN in $MOONBASE/$SECTION/$1/plugin.d/*.plugin; do
-					debug_msg "Removed \"$(basename $PLUGIN)\""
-					rm -f $PLUGIN_DIR/$(basename $PLUGIN)
+					debug_msg "Installed \"$(basename $PLUGIN)\""
+					install -m644 $PLUGIN $PLUGIN_DIR/
 				done
-			elif [ -n "$2" ] ; then
+			elif [ "$2" == "remove" ] || ! module_installed $1 ; then
 				for PLUGIN in $MOONBASE/$SECTION/$1/plugin.d/*.plugin; do
 					debug_msg "Removed \"$(basename $PLUGIN)\""
 					rm -f $PLUGIN_DIR/$(basename $PLUGIN)