From: Thibault Godouet Date: Tue, 10 Jul 2001 10:52:27 +0000 (+0000) Subject: added /usr/ucb to PATH (Solaris compatibility mode) X-Git-Tag: ver2_9_4~286 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9f6dfefb2942e246d7c77f90f839fd9d1816e9b7;p=thirdparty%2Ffcron.git added /usr/ucb to PATH (Solaris compatibility mode) --- diff --git a/script/boot-install b/script/boot-install index 26362b6..ece356e 100755 --- a/script/boot-install +++ b/script/boot-install @@ -2,7 +2,7 @@ # Install fcron under SysV system. # -# $Id: boot-install,v 1.34 2001-06-03 10:59:35 thib Exp $ +# $Id: boot-install,v 1.35 2001-07-10 10:54:09 thib Exp $ # take 6 arguments : the name of the BSD-like install program (with "-o" and the correct username) # the DESTSBIN directory @@ -12,6 +12,9 @@ # the src dir PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin" +if test -d /usr/ucb; then + PATH=/usr/ucb:$PATH +fi startdir=$PWD if test $# -ne 6; then @@ -268,6 +271,16 @@ echo "please do it manually." fi +if PID=`pidof fcron`; then + KILL="kill -TERM $PID" + KILLSTR="kill -TERM \`pidof fcron\`" +else + KILL="killall -TERM fcron" + KILLSTR=$KILL + COMMENT="WARNING : this command may not have the desired effect on non-Linux systems.\n" + PID="test -z on PID is not need in this case" +fi + # NEED_UPDATE is set at the beginning of this script if test $NEED_UPDATE -eq 0; then # we stop fcron like this (not using "fcron restart") because @@ -276,15 +289,6 @@ if test $NEED_UPDATE -eq 0; then echo "You should now stop the old version of fcron and start the new one." RESTART="nothing" COMMENT="" - if PID=`pidof fcron`; then - KILL="kill -TERM $PID" - KILLSTR="kill -TERM \`pidof fcron\`" - else - KILL="killall -TERM fcron" - KILLSTR=$KILL - COMMENT="WARNING : this command may not have the desired effect on non-Linux systems.\n" - PID="test -z on PID is not need in this case" - fi if test -z "$PID"; then echo "Fcron is not running." KILL="" @@ -326,15 +330,6 @@ else # test $NEED_UPDATE -eq 0 echo "You should now stop the old version fcron." STOP="nothing" COMMENT="" - if PID=`pidof fcron`; then - KILL="kill -TERM $PID" - KILLSTR="kill -TERM \`pidof fcron\`" - else - KILL="killall -TERM fcron" - KILLSTR=$KILL - COMMENT="WARNING : this command may not have the desired effect on non-Linux systems.\n" - PID="test -z on PID is not need in this case" - fi if test -z "$PID"; then echo "Fcron is not running." echo "You may start it after having updated the fcrontabs." diff --git a/script/boot-uninstall b/script/boot-uninstall index 717aec0..e94c234 100755 --- a/script/boot-uninstall +++ b/script/boot-uninstall @@ -2,9 +2,12 @@ # Uninstall fcron under SysV system. # -# $Id: boot-uninstall,v 1.7 2001-04-21 08:52:53 thib Exp $ +# $Id: boot-uninstall,v 1.8 2001-07-10 10:52:27 thib Exp $ PATH="/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin" +if test -d /usr/ucb; then + PATH=/usr/ucb:$PATH +fi if test `uname -s` = "FreeBSD"; then rm -f /usr/local/etc/rc.d/fcron.sh