[Lunar-commits] <lunar> Backmerge: fix wrappers and add the last 2 new plugin hooks.

[Auke Kok]

commit cb24a48f1f9d8802e527c68f89f5a1615e3d5b68
Author: Auke Kok <sofar at lunar-linux.org>
Date:   Wed Jul 27 11:17:51 2005 +0000

    Backmerge: fix wrappers and add the last 2 new plugin hooks.
---
 sbin/lrm                              |    2 ++
 var/lib/lunar/compilers/c++           |    4 +---
 var/lib/lunar/compilers/cc            |    4 +---
 var/lib/lunar/compilers/g++           |    4 +---
 var/lib/lunar/compilers/gcc           |    4 +---
 var/lib/lunar/functions/plugins.lunar |    2 ++
 6 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/sbin/lrm b/sbin/lrm
index 5420f5b..e1d1e09 100755
--- a/sbin/lrm
+++ b/sbin/lrm
@@ -145,6 +145,7 @@ lrm_module() {
 
   # time-out 1: PRE_REMOVE
   if [ "$UPGRADE" != "on" ]; then
+    plugin_call BUILD_PRE_REMOVE $MODULE
     run_module_file $MODULE PRE_REMOVE
   fi
 
@@ -183,6 +184,7 @@ lrm_module() {
 
   # time-out 2: POST_REMOVE
   if [ "$UPGRADE" != "on" ] ; then
+    plugin_call BUILD_POST_REMOVE $MODULE
     run_module_file $MODULE POST_REMOVE
   fi
   if [ "$KEEPCONFIG" == "on" -o "$UPGRADE" == "on" ] ; then
diff --git a/var/lib/lunar/compilers/c++ b/var/lib/lunar/compilers/c++
index 1b63334..237bcf0 100755
--- a/var/lib/lunar/compilers/c++
+++ b/var/lib/lunar/compilers/c++
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
-
 if [ -n "$LUNAR_DEBUG" ] ; then
   echo "++ $CXX_EXT g++ $CCOPT \"$@\"" >&2
 fi
 
-$CXX_EXT g++ $CCOPT "$@"
+$CXX_EXT /usr/bin/g++ $CCOPT "$@"
 
diff --git a/var/lib/lunar/compilers/cc b/var/lib/lunar/compilers/cc
index b415866..5ef5bd4 100755
--- a/var/lib/lunar/compilers/cc
+++ b/var/lib/lunar/compilers/cc
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
-
 if [ -n "$LUNAR_DEBUG" ] ; then
   echo "++ $CC_EXT gcc $COPT \"$@\"" >&2
 fi
   
-$CC_EXT gcc $COPT "$@"
+$CC_EXT /usr/bin/gcc $COPT "$@"
 
diff --git a/var/lib/lunar/compilers/g++ b/var/lib/lunar/compilers/g++
index 18226d0..6a7f765 100755
--- a/var/lib/lunar/compilers/g++
+++ b/var/lib/lunar/compilers/g++
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
-
 if [ -n "$LUNAR_DEBUG" ] ; then
   echo "++ $CXX_EXT g++ $CCOPT \"$@\"" >&2
 fi
   
-$CXX_EXT g++ $CCOPT "$@"
+$CXX_EXT /usr/bin/g++ $CCOPT "$@"
 
diff --git a/var/lib/lunar/compilers/gcc b/var/lib/lunar/compilers/gcc
index b415866..5ef5bd4 100755
--- a/var/lib/lunar/compilers/gcc
+++ b/var/lib/lunar/compilers/gcc
@@ -1,10 +1,8 @@
 #!/bin/bash
 
-export PATH=${PATH/\/var\/lib\/lunar\/compilers:/}
-
 if [ -n "$LUNAR_DEBUG" ] ; then
   echo "++ $CC_EXT gcc $COPT \"$@\"" >&2
 fi
   
-$CC_EXT gcc $COPT "$@"
+$CC_EXT /usr/bin/gcc $COPT "$@"
 
diff --git a/var/lib/lunar/functions/plugins.lunar b/var/lib/lunar/functions/plugins.lunar
index 3500914..20ced3c 100644
--- a/var/lib/lunar/functions/plugins.lunar
+++ b/var/lib/lunar/functions/plugins.lunar
@@ -35,6 +35,8 @@ plugin_register() {
 	# 10 - BUILD_INSTALL             ,,     ,,     ,,    INSTALL
 	# 11 - BUILD_POST_BUILD          ,,     ,,     ,,    POST_BUILD
 	# 12 - BUILD_POST_INSTALL        ,,     ,,     ,,    POST_INSTALL
+	# 13 - BUILD_PRE_REMOVE          ,,     ,,     ,,    PRE_REMOVE
+	# 14 - BUILD_POST_REMOVE         ,,     ,,     ,,    POST_REMOVE
 	LUNAR_PLUGINS=(${LUNAR_PLUGINS[@]} "$1:$2")
 	((LUNAR_PLUGIN_COUNT++))
 	debug_msg "Registered plugin #$LUNAR_PLUGIN_COUNT, $1 -> $2()"