Attachment 91000 Details for Bug 201470 – New patch with Joel's correction

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] New patch with Joel's correction

201470 patch.txt (text/plain), 3.12 KB, created by Bing Xu

on 2008-02-28 09:40:04 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Bing Xu

Created: 2008-02-28 09:40:04 EST

Size: 3.12 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.agentcontroller
>Index: src-native-new/bin/ACStart.sh
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/bin/ACStart.sh,v
>retrieving revision 1.6
>diff -u -r1.6 ACStart.sh
>--- src-native-new/bin/ACStart.sh	5 Feb 2008 20:09:53 -0000	1.6
>+++ src-native-new/bin/ACStart.sh	28 Feb 2008 14:39:08 -0000
>@@ -4,10 +4,10 @@
> #
> 
> #
>-# If TPTP_AC_HOME is not set then we assume we are running from bin.
>+# If TPTP_AC_HOME is not set then set it to the parent directory of the directory containing this script
> #
>-if [ "$TPTP_AC_HOME" = "" ]; then
>-	TPTP_AC_HOME=..
>+if [ -z $TPTP_AC_HOME ]; then
>+	TPTP_AC_HOME=`dirname $0`/..
> 	export TPTP_AC_HOME
> fi
> PATH=$TPTP_AC_HOME/bin:$PATH
>@@ -55,7 +55,7 @@
> # Start the ACServer
> #
> RUNNING=`ps -ae | grep "ACServer" | wc -l`
>-if [ $RUNNING != "0" ];then
>+if [ $RUNNING -ne 0 ];then
> 	ps -ae | grep "ACServer" | awk '{
>   	print "The server is already running on pid " $1
> 	}'      
>@@ -73,7 +73,7 @@
> # Check if ACServer is running by querying the system process list
> #
> ps -ae | grep "ACServer" | wc -l | awk '{
>-	if( $1!="0" ) {
>+	if( $1 -ne 0 ) {
> 		print "ACServer started successfully."
> 		exit 0
> 	}
>Index: src-native-new/bin/ACVersion.sh
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/bin/ACVersion.sh,v
>retrieving revision 1.2
>diff -u -r1.2 ACVersion.sh
>--- src-native-new/bin/ACVersion.sh	15 Oct 2007 17:19:41 -0000	1.2
>+++ src-native-new/bin/ACVersion.sh	28 Feb 2008 14:39:08 -0000
>@@ -4,10 +4,10 @@
> #
> 
> #
>-# If TPTP_AC_HOME is not set then we assume we are running from bin.
>+# If TPTP_AC_HOME is not set then set it to the parent directory of the directory containing this script
> #
>-if [ "$TPTP_AC_HOME" = "" ]; then
>-	TPTP_AC_HOME=..
>+if [ -z $TPTP_AC_HOME ]; then
>+	TPTP_AC_HOME=`dirname $0`/..
> 	export TPTP_AC_HOME
> fi
> PATH=$TPTP_AC_HOME/bin:$PATH
>Index: src-native-new/bin/ACStop.sh
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.agentcontroller/src-native-new/bin/ACStop.sh,v
>retrieving revision 1.5
>diff -u -r1.5 ACStop.sh
>--- src-native-new/bin/ACStop.sh	5 Feb 2008 20:09:53 -0000	1.5
>+++ src-native-new/bin/ACStop.sh	28 Feb 2008 14:39:08 -0000
>@@ -3,10 +3,10 @@
> # ACStop.sh - Stops the Agent Controller server process if it is running.
> #
> 
>-# If TPTP_AC_HOME is not set then we assume we are running from bin.
>+# If TPTP_AC_HOME is not set then set it to the parent directory of the directory containing this script
> #
>-if [ "$TPTP_AC_HOME" = "" ]; then
>-	TPTP_AC_HOME=..
>+if [ -z $TPTP_AC_HOME ]; then
>+	TPTP_AC_HOME=`dirname $0`/..
> 	export TPTP_AC_HOME
> fi
> PATH=$TPTP_AC_HOME/bin:$PATH
>@@ -35,7 +35,7 @@
> fi
> 
> RUNNING=`ps -ae | grep "ACServer" | wc -l`
>-if [ $RUNNING != "0" ];then
>+if [ $RUNNING -ne 0 ];then
> 	ACServer -shutdown
>         echo "ACServer stopped."
>         exit 0

Actions: View | Diff

Attachments on bug 201470: 90906 | 91000