From 1ea0e820e70e56f03e2cfc922ebcccb18fe7d84f Mon Sep 17 00:00:00 2001
From: Martin Oberhuber < martin.oberhuber@windriver.com>
Date: Thu, 21 Sep 2006 21:04:09 +0000
Subject: [PATCH] Fix server.sh for Solaris (Bourne Shell doesnt understand
 export x=y)

---
 .../serverruntime/scripts/aix/server.sh               | 11 ++++++-----
 .../serverruntime/scripts/macosx/server.sh            |  7 ++++---
 .../serverruntime/scripts/unix/server.sh              |  9 +++++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh
index f214b5af350..099a6bd6ea8 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/aix/server.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 # Shell script to start an RSE communications server
-# This script will start the datastore listening on an available socket
+# This script will start the datastore server listening on an available socket
 
-export serverpath=.;
-export PATH=/usr/java131/jre/bin:$PATH
-export CLASSPATH=/usr/java131/jre/lib/rt.jar:/usr/jdk_base/lib/classes.zip:$CLASSPATH
-export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
+serverpath=.;
+PATH=/usr/java131/jre/bin:$PATH
+CLASSPATH=/usr/java131/jre/lib/rt.jar:/usr/jdk_base/lib/classes.zip:$CLASSPATH
+CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
+export serverpath PATH CLASSPATH
 java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 &
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/macosx/server.sh b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/macosx/server.sh
index b437e06c33e..f96a0ebb769 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/macosx/server.sh
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/macosx/server.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
-# Shell script to start RSE communications server
+# Shell script to start an RSE communications server
 # This script will start the datastore server listening on an available socket
-export serverpath=.;
-export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
+serverpath=.;
+CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
+export serverpath CLASSPATH
 if [ $1 ]                     
 then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 &
 else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 &
diff --git a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh
index 9743bdb3420..f96a0ebb769 100644
--- a/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh
+++ b/rse/plugins/org.eclipse.rse.services.dstore/serverruntime/scripts/unix/server.sh
@@ -1,8 +1,9 @@
 #!/bin/sh
-# Shell script to starat RSE communications server
-# This script will start the datastore listening on an available socket
-export serverpath=.;
-export CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
+# Shell script to start an RSE communications server
+# This script will start the datastore server listening on an available socket
+serverpath=.;
+CLASSPATH=.:dstore_extra_server.jar:dstore_core.jar:dstore_miners.jar:clientserver.jar:$CLASSPATH;
+export serverpath CLASSPATH
 if [ $1 ]                     
 then java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -Dclient.username=$1 -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 &
 else java -DA_PLUGIN_PATH=$serverpath -DDSTORE_TRACING_ON=false -DDSTORE_SPIRIT_ON=true org.eclipse.dstore.core.server.Server 0 60000 &