- mkdir cron.weekly is unneccessary and *wrong*

[packages/bigsister.git] / bigsister.init

diff --git a/bigsister.init b/bigsister.init
index 934e4527d6146724c62fad0c7d5bd64f8b5050c2..080a38e10e252aa931e61cfbd2863bfe7b309eda 100644 (file)
--- a/bigsister.init
+++ b/bigsister.init
@@ -10,14 +10,14 @@
 
 # Get network config
 . /etc/sysconfig/network
-
+# fix the problem, making sure that bigsister only see english messages
+LANG=C LC_MESSAGES=C export LANG LC_MESSAGES
 # Get service config
 [ -f /etc/sysconfig/bigsister ] && . /etc/sysconfig/bigsister
 
 # Check that networking is up.
 if is_yes "${NETWORKING}"; then
-       if [ ! -f /var/lock/subsys/network -a != stop -a != status ]; then
-               # nls "ERROR: Networking is down. %s can't be run." <service>
+       if [ ! -f /var/lock/subsys/network -a "$1" != stop -a "$1" != status ]; then
                msg_network_down Big Sister
                exit 1
        fi
@@ -25,17 +25,6 @@ else
        exit 0
 fi
 
-bs_killproc() {                # kill the named process(es)
-       msg_stopping "${4-$1}"
-       pid=`ps -e -o pid,comm,args 2>/dev/null | grep -w perl 2>/dev/null | grep " $1 " 2>/dev/null | grep -v grep | awk '{ print $1 }'`
-       if [ "$pid" != "" ]; then 
-               kill $2 $pid && ok || fail
-       else
-               [ "$3" != "y" ] && ok || died
-       fi
-}
-
-
 RETVAL=0
 # See how we were called.
 case "$1" in
@@ -48,19 +37,33 @@ case "$1" in
                        uxmonprefix="su - bs -s /bin/sh"
                fi
                umask 022
-               if [ -f /usr/lib/bs/bin/bsmon -a -f /etc/bs/etc/bsmon.cfg ]; then
+               if [ -f /usr/share/bigsister/bin/bsmon ]; then
                        msg_starting "Big Sister bsmon"
-                       $uxmonprefix -c "/usr/bin/setsid /usr/lib/bs/bin/bsmon" > /dev/null 2>&1
+                       $uxmonprefix -c "/usr/bin/setsid /usr/share/bigsister/bin/bsmon" > /dev/null 2>&1
                        RETVAL=$?
                        [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
                fi
-               if [ -f /usr/lib/bs/bin/bbd -a -f /etc/bs/adm/bb-display.cfg ]; then
+               if [ -f /usr/share/bigsister/bin/bbd -a -f /etc/bigsister/bb-display.cfg ]; then
                        msg_starting "Big Sister bbd"
-                       $uxmonprefix -c "/usr/bin/setsid /usr/lib/bs/bin/bbd -b /usr/lib/bs $BBD_ARGS" >/dev/null 2>&1
+                       $uxmonprefix -c "/usr/bin/setsid /usr/share/bigsister/bin/bbd -b /etc/bigsister $BBD_ARGS" >/dev/null 2>&1
                        RETVAL=$?
                        [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
                fi
-               for f in /etc/bs/adm/uxmon-net* ; do
+               for f in /etc/bigsister/uxmon-asroot* ; do
+                       set `basename $f`
+                       case $1 in
+                         *bak|*%|*~|*.rpmsave|*.rpmorig|*.rpmnew)
+                               continue
+                               ;;
+                         *)
+                               msg_starting "Big Sister uxmon $1"
+                               /bin/sh -c "/usr/bin/setsid /usr/share/bigsister/uxmon/uxmon -r /usr/share/bigsister/uxmon/uxmon-rules.pl -b /usr/share/bigsister -c /etc/bigsister/uxmon-asroot" >/dev/null 2>&1
+                               RETVAL=$?
+                               [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
+                               ;;
+                       esac
+               done
+               for f in /etc/bigsister/uxmon-net* ; do
                        set `basename $f`
                        case $1 in
                          *bak|*%|*~|*.rpmsave|*.rpmorig|*.rpmnew)
@@ -68,16 +71,16 @@ case "$1" in
                                ;;
                          *)
                                msg_starting "Big Sister uxmon $1"
-                               $uxmonprefix -c "/usr/bin/setsid /usr/lib/bs/uxmon/uxmon -r /usr/lib/bs/uxmon/uxmon-rules.pl -b /usr/lib/bs -c $1" >/dev/null 2>&1
+                               su - bs -s /bin/sh -c "/usr/bin/setsid /usr/share/bigsister/uxmon/uxmon -r /usr/share/bigsister/uxmon/uxmon-rules.pl -b /usr/share/bigsister -c /etc/bigsister/uxmon-net" >/dev/null 2>&1
                                RETVAL=$?
                                [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
                                ;;
                        esac
                done
-               if [ -f /etc/bs/adm/bstrapd.cfg ]; then
+               if [ -f /etc/bigsister/etc/bstrapd.cfg ]; then
                        # bstrapd will only run as root
                        msg_starting "Big Sister bstrapd"
-                       /usr/bin/setsid /usr/lib/bs/bin/bstrapd >/dev/null 2>&1
+                       /usr/bin/setsid /usr/share/bigsister/bin/bstrapd >/dev/null 2>&1
                        [ "$RETVAL" -eq 0 ] && ok || ( fail ; exit $RETVAL )
                fi
                touch /var/lock/subsys/bigsister
@@ -87,15 +90,22 @@ case "$1" in
        ;;
   stop)
        if [ -f /var/lock/subsys/bigsister ]; then
-               bs_killproc uxmon -QUIT y "Big Sister uxmon"
-               bs_killproc bbd -QUIT n "Big Sister bbd if running"
-               bs_killproc bb_event_generator -QUIT n "Big Sister bb_event_generator if running"
-               bs_killproc bsmon -QUIT n "Big Sister bsmon if running"
-               bs_killproc bstrapd -QUIT n "Big Sister bstrapd if running"
-               rm -f /var/lock/subsys/bigsister
-       else
-               msg_not_running "Big Sister"
-       fi
+               msg_stopping "Big Sister uxmon"
+               killproc uxmon
+               msg_stopping "Big Sister uxmon"
+               killproc uxmon
+               msg_stopping "Big Sister bsmon if running"
+               killproc bsmon
+               msg_stopping "Big Sister bbd if running"
+               killproc bbd
+               msg_stopping "Big Sister bb_event_generator if running"
+               killproc bb_event_generator
+               msg_stopping "Big Sister bstrapd if running"
+               killproc bstrapd
+       rm -f /var/lock/subsys/bigsister
+        else
+                msg_not_running "Big Sister"
+        fi
        ;;
   status)
        ;;
@@ -108,5 +118,4 @@ case "$1" in
        msg_usage "$0 {start|stop|restart|force-reload|status}"
        exit 3
 esac
-
 exit $RETVAL