Added RAPTOR2/RASQAL_NUM_VER to config.sh.

3 files changed, 13 insertions, 10 deletions

diff --git a/config.sh b/config.sh
index 17fc9f8..6cfe681 100755
--- a/config.sh
+++ b/config.sh
@@ -16,11 +16,9 @@ OT_JAVA_HOME="/usr/lib/jvm/java-6-openjdk"
 # 3) What versions to install
 
 OB_NUM_VER="2.3.1"
+RAPTOR2_NUM_VER="2.0.8"
+RASQAL_NUM_VER="0.9.29"
 RUBY_DWL="http://ftp.ruby-lang.org/pub/ruby/1.9"
-RAPTOR2_VER="2.0.8"
-RAPTOR2_DWL="http://download.librdf.org/source/raptor2-$RAPTOR2_VER.tar.gz"
-RASQAL_VER="0.9.29"
-RASQAL_DWL="http://download.librdf.org/source/rasqal-$RASQAL_VER.tar.gz"
 
 # Done.
 
@@ -36,6 +34,11 @@ OT_UI_CONF="$HOME/.opentox/opentox-ui.sh"
 OT_DEFAULT_CONFIG="$HOME/.opentox/config/default.rb"
 
 OB_VER="openbabel-$OB_NUM_VER"
+RAPTOR2_VER="raptor2-$RAPTOR2_NUM_VER"
+RASQAL_VER="rasqal-$RASQAL_NUM_VER"
 OB_DEST="$OT_PREFIX/$OB_VER"
 OB_DEST_BINDINGS="$OT_PREFIX/openbabel-ruby-install"
 
+RAPTOR2_DWL="http://download.librdf.org/source/$RAPTOR2_VER.tar.gz"
+RASQAL_DWL="http://download.librdf.org/source/$RASQAL_VER.tar.gz"
+
diff --git a/raptor2-install b/raptor2-install
index 11a5737..0590a3b 100755
--- a/raptor2-install
+++ b/raptor2-install
@@ -12,9 +12,9 @@ mkdir -p $OT_PREFIX/tmp
 cd $OT_PREFIX/tmp/
 cmd="$WGET $RAPTOR2_DWL" && run_cmd "$cmd" "Download"
 export RAPTOR2_DIR=$OT_PREFIX/$SELF
-cmd="$TAR xvzf $SELF-$RAPTOR2_VER.tar.gz" && run_cmd "$cmd" "Unpack" 
-rm $SELF-$RAPTOR2_VER.tar.gz
-cd $SELF-$RAPTOR2_VER
+cmd="$TAR xvzf $RAPTOR2_VER.tar.gz" && run_cmd "$cmd" "Unpack" 
+rm $RAPTOR2_VER.tar.gz
+cd $RAPTOR2_VER
 cmd="./configure --prefix=$RAPTOR2_DIR" && run_cmd "$cmd" "Configure"
 cmd="$MAKE" && run_cmd "$cmd" "Make"
 cmd="$MAKE install" && run_cmd "$cmd" "Make Install"
diff --git a/rasqal-install b/rasqal-install
index dcd9e35..42574bd 100755
--- a/rasqal-install
+++ b/rasqal-install
@@ -12,9 +12,9 @@ mkdir -p $OT_PREFIX/tmp
 cd $OT_PREFIX/tmp/
 cmd="$WGET $RASQAL_DWL" && run_cmd "$cmd" "Download"
 export RASQAL_DIR=$OT_PREFIX/$SELF
-cmd="$TAR xvzf $SELF-$RASQAL_VER.tar.gz" && run_cmd "$cmd" "Unpack"
-rm $SELF-$RASQAL_VER.tar.gz
-cd $SELF-$RASQAL_VER
+cmd="$TAR xvzf $RASQAL_VER.tar.gz" && run_cmd "$cmd" "Unpack"
+rm $RASQAL_VER.tar.gz
+cd $RASQAL_VER
 cmd="./configure --prefix=$RASQAL_DIR" && run_cmd "$cmd" "Configure"
 cmd="$MAKE" && run_cmd "$cmd" "Make"
 cmd="$MAKE install" && run_cmd "$cmd" "Make Install"