Renamed config files and added ot-tools.

2 files changed, 8 insertions, 6 deletions

diff --git a/config.sh b/config.sh
index 6cfe681..c0a09e5 100755
--- a/config.sh
+++ b/config.sh
@@ -24,13 +24,14 @@ RUBY_DWL="http://ftp.ruby-lang.org/pub/ruby/1.9"
 
 
 ### Nothing to gain from changes below this line.
-JAVA_CONF="$HOME/.opentox/sh_java"
-FST_CONF="$HOME/.opentox/sh_4S"
-OB_CONF="$HOME/.opentox/sh_OB"
-R_CONF="$HOME/.opentox/sh_R"
-RAPTOR2_CONF="$HOME/.opentox/sh_RAPTOR2"
-RASQAL_CONF="$HOME/.opentox/sh_RASQAL"
+JAVA_CONF="$HOME/.opentox/java.sh"
+FST_CONF="$HOME/.opentox/4S.sh"
+OB_CONF="$HOME/.opentox/OB.sh"
+R_CONF="$HOME/.opentox/R.sh"
+RAPTOR2_CONF="$HOME/.opentox/RAPTOR2.sh"
+RASQAL_CONF="$HOME/.opentox/RASQAL.sh"
 OT_UI_CONF="$HOME/.opentox/opentox-ui.sh"
+OT_TOOLS_CONF="$HOME/.opentox/ot-tools.sh"
 OT_DEFAULT_CONFIG="$HOME/.opentox/config/default.rb"
 
 OB_VER="openbabel-$OB_NUM_VER"
diff --git a/install b/install
index 5211edd..86d025c 100755
--- a/install
+++ b/install
@@ -58,5 +58,6 @@ fi
 
 [ -f $HOME/.opentox/config/ambit_descriptors.yaml ] || (cmd="cp ambit_descriptors.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Ambit keys file")
 [ -f $HOME/.opentox/config/jl_keys.yaml ] || (cmd="cp jl_keys.yaml $HOME/.opentox/config/" && run_cmd "$cmd" "Joelib keys file")
+[ -f $OT_TOOLS_CONFIG ] || (cmd="cp ot-tools-user.sh $OT_TOOLS_CONFIG" && run_cmd "$cmd" "Install ot-tools.sh to CONFIG (~/.opentox/config)")
 
 notify