scripts: use jre7 as default, only define jre in start script

3 files changed, 3 insertions, 7 deletions

diff --git a/scripts/jabot-init-debian b/scripts/jabot-init-debian
index 68f51f8..6caf47a 100755
--- a/scripts/jabot-init-debian
+++ b/scripts/jabot-init-debian
@@ -30,8 +30,6 @@ JABOT_USER=jabot
 JABOT_HOME=/srv/$JABOT_USER/jabot
 startup=$JABOT_HOME/scripts/start.jabot.sh
 shutdown=$JABOT_HOME/scripts/stop.jabot.sh
-# export JAVA_HOME=/opt-linux-x86_64/j2se6
-export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::")
 
 start(){
  echo -n $"Starting Jabot service: "
diff --git a/scripts/jabot-init-redhat b/scripts/jabot-init-redhat
index 7975ee1..1643f7f 100755
--- a/scripts/jabot-init-redhat
+++ b/scripts/jabot-init-redhat
@@ -21,8 +21,6 @@ JABOT_USER=jabot
 JABOT_HOME=/srv/$JABOT_USER/jabot
 startup=$JABOT_HOME/scripts/start.jabot.sh
 shutdown=$JABOT_HOME/scripts/stop.jabot.sh
-# export JAVA_HOME=/opt-linux-x86_64/j2se6
-export JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::")
 
 start(){
  echo -n $"Starting Jabot service: "
diff --git a/scripts/start.jabot.sh b/scripts/start.jabot.sh
index a23a435..7fbf78f 100755
--- a/scripts/start.jabot.sh
+++ b/scripts/start.jabot.sh
@@ -2,10 +2,10 @@
 
 export JABOT_HOME=/srv/jabot/jabot
 export JABOT_LOG=$JABOT_HOME/irc_jogamp_CatOut_`date -u +%Y%m%d%H%M`.log
-# JAVA_HOME=/opt-linux-x86_64/j2se6
-JAVA_HOME=$(readlink -f /usr/bin/javac | sed "s:bin/javac::")
+export JRE_HOME=/opt-linux-x86_64/jre7
+# export JRE_HOME=$(readlink -f /usr/bin/java | sed "s:bin/java::")
 
-JAVA=$JAVA_HOME/bin/java
+JAVA=$JRE_HOME/bin/java
 nohup nice $JAVA \
     -cp $JABOT_HOME/build/jabot.jar org.jogamp.jabot.irc.CatOut \
         -login jogamp -name CatOut \