Fixed JAVA_HOME

1 files changed, 14 insertions, 14 deletions

diff --git a/config.sh b/config.sh
index 6d568d9..1e0bb79 100755
--- a/config.sh
+++ b/config.sh
@@ -10,8 +10,8 @@ OT_INSTALL="local"     # Type                  (gem, local, server)
 OT_BRANCH="master"     # Maturity              (development, master)
 
 # 2) Where all binaries are installed.
-PREFIX="$HOME/opentox"
-JAVA_HOME="/usr/lib/jvm/java-6-sun"
+OT_PREFIX="$HOME/opentox"
+OT_JAVA_HOME="/usr/lib/jvm/java-6-sun"
 
 # 3) What versions to install.
 RUBY_NUM_VER="1.8.7-2011.03"
@@ -21,29 +21,29 @@ REDIS_NUM_VER="2.2.2"
 
 # 4) Server settings.
 NGINX_SERVERNAME="localhost"
-WWW_DEST="$PREFIX/www"
+WWW_DEST="$OT_PREFIX/www"
 
 # Done.
 
 
 ### Nothing to gain from changes below this line.
-JAVA_CONF="$PREFIX/.bash_java_ot"
-RUBY_CONF="$PREFIX/.bash_ruby_ot"
-REDIS_CONF="$PREFIX/.bash_redis_ot"
-OB_CONF="$PREFIX/.bash_OB_ot"
-KL_CONF="$PREFIX/.bash_R_ot"
+JAVA_CONF="$OT_PREFIX/.bash_java_ot"
+RUBY_CONF="$OT_PREFIX/.bash_ruby_ot"
+REDIS_CONF="$OT_PREFIX/.bash_redis_ot"
+OB_CONF="$OT_PREFIX/.bash_OB_ot"
+KL_CONF="$OT_PREFIX/.bash_R_ot"
 
 RUBY_VER="ruby-enterprise-$RUBY_NUM_VER"
 OB_VER="openbabel-$OB_NUM_VER"
 KL_VER="$KL_NUM_VER"
 REDIS_VER="$REDIS_NUM_VER"
 
-RUBY_DEST="$PREFIX/$RUBY_VER"
-OB_DEST="$PREFIX/$OB_VER"
-OB_DEST_BINDINGS="$PREFIX/openbabel-ruby-install"
-KL_DEST="$PREFIX/r-packages"
-NGINX_DEST="$PREFIX/nginx"
-REDIS_DEST="$PREFIX/redis-$REDIS_VER"
+RUBY_DEST="$OT_PREFIX/$RUBY_VER"
+OB_DEST="$OT_PREFIX/$OB_VER"
+OB_DEST_BINDINGS="$OT_PREFIX/openbabel-ruby-install"
+KL_DEST="$OT_PREFIX/r-packages"
+NGINX_DEST="$OT_PREFIX/nginx"
+REDIS_DEST="$OT_PREFIX/redis-$REDIS_VER"
 
 REDIS_SERVER_CONF="$REDIS_DEST/redis.conf"
 OT_UI_CONF="$HOME/.opentox-ui.sh"