Renamed config variables.

3 files changed, 4 insertions, 4 deletions

diff --git a/4store-install b/4store-install
index 6c8ec39..1125a3a 100755
--- a/4store-install
+++ b/4store-install
@@ -25,7 +25,7 @@ cmd="make install" && run_cmd "$cmd" "Make Install"
 
 # Config
 echo "if echo \"\$LD_LIBRARY_PATH\" | grep -v \"$FST/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"\$LD_LIBRARY_PATH:$FST/lib\"; fi" >> "$FST_CONF"
-if ! cat "$OT_DEFAULT_CONFIG" | grep "four_store">/dev/null 2>&1; then echo '\$four_store = { :uri => "http://localhost:8088", :user => "", :password => "" }' >> $OT_DEFAULT_CONFIG; fi
+if ! cat "$OT_DEFAULT_CONF" | grep "four_store">/dev/null 2>&1; then echo '\$four_store = { :uri => "http://localhost:8088", :user => "", :password => "" }' >> $OT_DEFAULT_CONF; fi
 
 echo "$SELF configuration has been stored in '$FST_CONF'."
 if ! grep "$FST_CONF" $OT_UI_CONF >/dev/null 2>&1; then
diff --git a/config.sh b/config.sh
index c0a09e5..d844d55 100755
--- a/config.sh
+++ b/config.sh
@@ -32,7 +32,7 @@ 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"
+OT_DEFAULT_CONF="$HOME/.opentox/config/default.rb"
 
 OB_VER="openbabel-$OB_NUM_VER"
 RAPTOR2_VER="raptor2-$RAPTOR2_NUM_VER"
diff --git a/install b/install
index 66dae4d..0c99b15 100755
--- a/install
+++ b/install
@@ -38,7 +38,7 @@ 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_CONFIG ] || (cmd="echo '\$aa = { :uri => nil }' > $OT_DEFAULT_CONFIG" && run_cmd "$cmd" "Install default.rb 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/config)")
 
 
 . ./base-install # Debian specific; disable this for others.
@@ -58,6 +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)")
+[ -f $OT_TOOLS_CONF ] || (cmd="cp ot-tools-user.sh $OT_TOOLS_CONFIG" && run_cmd "$cmd" "Install ot-tools.sh to CONFIG (~/.opentox/config)")
 
 notify