diff options
author | Andreas Maunz <andreas@maunz.de> | 2012-01-31 10:27:08 +0100 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2012-01-31 10:27:08 +0100 |
commit | b4fe271712f34a9723b13973b467317718c13e4b (patch) | |
tree | 3d3c21751d521ed82d40f581e7e17a62b1166c83 /config.sh | |
parent | b6fb537437568bdf274451554663d8273151ffe8 (diff) | |
parent | 9282f0715873f96cf43c23261a808dc00fb78914 (diff) |
Merge branch 'caret' into pc_new_1
Diffstat (limited to 'config.sh')
-rwxr-xr-x | config.sh | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -16,7 +16,6 @@ OT_JAVA_HOME="/usr/lib/jvm/java-6-sun" # 3) What versions to install. RUBY_NUM_VER="1.8.7-2011.03" OB_NUM_VER="2.2.3" -KL_NUM_VER="0.9-11" REDIS_NUM_VER="2.2.2" # 4) Server settings. @@ -34,17 +33,16 @@ RUBY_CONF="$OT_PREFIX/.sh_ruby_ot" REDIS_CONF="$OT_PREFIX/.sh_redis_ot" NGINX_CONF="$OT_PREFIX/.sh_nginx_ot" OB_CONF="$OT_PREFIX/.sh_OB_ot" -KL_CONF="$OT_PREFIX/.sh_R_ot" +R_CONF="$OT_PREFIX/.sh_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="$OT_PREFIX/$RUBY_VER" OB_DEST="$OT_PREFIX/$OB_VER" OB_DEST_BINDINGS="$OT_PREFIX/openbabel-ruby-install" -KL_DEST="$OT_PREFIX/r-packages" +R_DEST="$OT_PREFIX/r-packages" NGINX_DEST="$OT_PREFIX/nginx" REDIS_DEST="$OT_PREFIX/redis-$REDIS_VER" |