Added compound to ot-tools. OT_PREFIX fix.

2 files changed, 1 insertions, 6 deletions

diff --git a/install b/install
index 537be01..a143418 100755
--- a/install
+++ b/install
@@ -39,9 +39,6 @@ echo
 [ -f $OT_PREFIX/install/utils.sh ] || (cmd="mkdir -p $OT_PREFIX/install && cp utils.sh $OT_PREFIX/install" && run_cmd "$cmd" "Install utils.sh to OT_PREFIX")
 [ -f $HOME/.opentox/config/install/config.sh ] || (cmd="mkdir -p $HOME/.opentox/config/install && cp config.sh $HOME/.opentox/config/install" && run_cmd "$cmd" "Install config.sh to CONFIG (~/.opentox/config)")
 [ -f $OT_DEFAULT_CONF ] || (cmd="echo '\$aa = { :uri => nil }' > $OT_DEFAULT_CONF" && run_cmd "$cmd" "Install default.rb to CONFIG (~/.opentox/conf)")
-# Added external compound service uri (only till it is available for the new architecture).
-if ! cat "$OT_DEFAULT_CONF" | grep "compound" | grep ":uri=">/dev/null 2>&1; then echo '$compound = { :uri => "http://webservices.in-silico.ch/compound" }' >> $OT_DEFAULT_CONF; fi
-
 
 . ./base-install # Debian specific; disable this for others.
 ./raptor2-install # Download, compile and build raptor2. Install to OT_PREFIX.
@@ -61,6 +58,5 @@ 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_CONF ] || (cmd="cp ot-tools-user.sh $OT_TOOLS_CONF" && run_cmd "$cmd" "Created ot-tools (stored in ~/.opentox)")
-if ! cat "$OT_TOOLS_CONF" | grep "OT_PREFIX=">/dev/null 2>&1; then echo "OT_PREFIX=$OT_PREFIX" >> $OT_TOOLS_CONF; fi
 
 notify
diff --git a/ot-tools-user.sh b/ot-tools-user.sh
index 52567f3..d60a26e 100644
--- a/ot-tools-user.sh
+++ b/ot-tools-user.sh
@@ -3,6 +3,7 @@
 # Load server config
 otconfig() {
   source $HOME/.opentox/opentox-ui.sh
+  source $HOME/.opentox/config/install/config.sh
 }
 
 # Display log
@@ -257,7 +258,6 @@ otcheck() {
     "validation") #check_service "validation";;
                   echo "$1 not available yet.";;
     "4store")     check_service "four_store";; 
-                  #killall 4s-backend >/dev/null 2>&1;;
     "all")        otcheck "algorithm";
                   otcheck "compound";
                   otcheck "dataset";
@@ -271,4 +271,3 @@ otcheck() {
                   return 1;;
   esac
 }
-OT_PREFIX=/home/ist/opentox-ruby