SOURCES: eventum-irc.init, eventum-router-qmail.sh, eventum-upgrad...

[glen]

Author: glen                         Date: Tue Dec 27 23:27:00 2005 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- use /usr/bin/php virtual

---- Files affected:
SOURCES:
   eventum-irc.init (1.4 -> 1.5) , eventum-router-qmail.sh (1.1 -> 1.2) , eventum-upgrade.sh (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/eventum-irc.init
diff -u SOURCES/eventum-irc.init:1.4 SOURCES/eventum-irc.init:1.5
--- SOURCES/eventum-irc.init:1.4	Wed Feb 23 16:21:03 2005
+++ SOURCES/eventum-irc.init	Wed Dec 28 00:26:55 2005
@@ -9,7 +9,6 @@
 # Get network config
 . /etc/sysconfig/network
 
-PHP=/usr/bin/php4
 PIDFILE=/var/run/eventum/irc_bot.pid
 
 # Get service config
@@ -32,7 +31,7 @@
 	if [ ! -f /var/lock/subsys/eventum-irc ]; then
 		msg_starting eventum-irc
 		start-stop-daemon --start \
-			--exec $PHP \
+			--exec /usr/bin/php \
 			--pidfile $PIDFILE \
 			--chuid http \
 			--chdir /usr/share/eventum/irc \

================================================================
Index: SOURCES/eventum-router-qmail.sh
diff -u SOURCES/eventum-router-qmail.sh:1.1 SOURCES/eventum-router-qmail.sh:1.2
--- SOURCES/eventum-router-qmail.sh:1.1	Thu Feb 24 13:56:23 2005
+++ SOURCES/eventum-router-qmail.sh	Wed Dec 28 00:26:55 2005
@@ -18,7 +18,7 @@
 esac
 
 cd /usr/share/eventum
-/usr/bin/php4 -q route_$TYPE.php "$@" && exit $OK
+/usr/bin/php -q route_$TYPE.php "$@" && exit $OK
 rc=$?
 
 # exit does are for postfix, based on /usr/include/sysexits.h

================================================================
Index: SOURCES/eventum-upgrade.sh
diff -u SOURCES/eventum-upgrade.sh:1.2 SOURCES/eventum-upgrade.sh:1.3
--- SOURCES/eventum-upgrade.sh:1.2	Mon Aug  1 14:42:40 2005
+++ SOURCES/eventum-upgrade.sh	Wed Dec 28 00:26:55 2005
@@ -8,19 +8,13 @@
 
 echo >&2 "Running eventum upgrade scripts to in $scriptdir"
 
-if [ -x /usr/bin/php4 ]; then
-	php=/usr/bin/php4
-else
-	php=/usr/bin/php
-fi
-
 upgrade_script() {
 	script="$1"; shift
 
 	echo -n "Eventum upgrade: $@..."
-	if ! $php -q $scriptdir/$script; then
+	if ! php $scriptdir/$script; then
 		echo >&2 ""
-		echo >&2 "Please run manually: $php -q $scriptdir/$script"
+		echo >&2 "Please run manually: php $scriptdir/$script"
 		echo >&2 "NOTE: You might need to add CREATE, DROP, ALTER and INDEX privileges to Eventum MySQL user for this to work".
 	fi
 	echo ""
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/eventum-irc.init?r1=1.4&r2=1.5&f=u
    http://cvs.pld-linux.org/SOURCES/eventum-router-qmail.sh?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/eventum-upgrade.sh?r1=1.2&r2=1.3&f=u