Replaced unsafe '*' with raspot2/rasqal version.

Added grep check.

3 files changed, 18 insertions, 16 deletions

diff --git a/config.sh b/config.sh
index d688e5c..17fc9f8 100755
--- a/config.sh
+++ b/config.sh
@@ -17,8 +17,10 @@ OT_JAVA_HOME="/usr/lib/jvm/java-6-openjdk"
 
 OB_NUM_VER="2.3.1"
 RUBY_DWL="http://ftp.ruby-lang.org/pub/ruby/1.9"
-RAPTOR2_DWL="http://download.librdf.org/source/raptor2-2.0.8.tar.gz"
-RASQAL_DWL="http://download.librdf.org/source/rasqal-0.9.29.tar.gz"
+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.
 
diff --git a/raptor2-install b/raptor2-install
index e3718ba..11a5737 100755
--- a/raptor2-install
+++ b/raptor2-install
@@ -5,25 +5,25 @@ DIR=`pwd`
 . ./utils.sh || (echo "Utils could not be loaded, check opentox-ui.sh." 1>&2 && exit 1)
 SELF=$(basename $0 -install)
 check_log $SELF
-check_utils "wget tar make"
+check_utils "wget tar make grep"
 
 # Build
 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*.tar.gz" && run_cmd "$cmd" "Unpack" 
-rm $SELF*.tar.gz
-cd $SELF*
+cmd="$TAR xvzf $SELF-$RAPTOR2_VER.tar.gz" && run_cmd "$cmd" "Unpack" 
+rm $SELF-$RAPTOR2_VER.tar.gz
+cd $SELF-$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"
 
 # Config
-echo "if echo \"\$LD_LIBRARY_PATH\" | grep -v \"$RAPTOR2_DIR/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"$RAPTOR2_DIR/lib:\$LD_LIBRARY_PATH\"; fi" >> "$RAPTOR2_CONF"
-echo "if echo \"\$PKG_CONFIG_PATH\" | grep -v \"$RAPTOR2_DIR/lib/pkgconfig\">/dev/null 2>&1; then export PKG_CONFIG_PATH=\"$RAPTOR2_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH\"; fi" >> "$RAPTOR2_CONF"
+echo "if echo \"\$LD_LIBRARY_PATH\" | $GREP -v \"$RAPTOR2_DIR/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"$RAPTOR2_DIR/lib:\$LD_LIBRARY_PATH\"; fi" >> "$RAPTOR2_CONF"
+echo "if echo \"\$PKG_CONFIG_PATH\" | $GREP -v \"$RAPTOR2_DIR/lib/pkgconfig\">/dev/null 2>&1; then export PKG_CONFIG_PATH=\"$RAPTOR2_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH\"; fi" >> "$RAPTOR2_CONF"
 echo "$SELF configuration has been stored in '$RAPTOR2_CONF'."
-if ! grep "$RAPTOR2_CONF" $OT_UI_CONF >/dev/null 2>&1; then
+if ! $GREP "$RAPTOR2_CONF" $OT_UI_CONF >/dev/null 2>&1; then
   echo '. '$RAPTOR2_CONF >> $OT_UI_CONF
 fi
 cd ..
diff --git a/rasqal-install b/rasqal-install
index bf35ca7..dcd9e35 100755
--- a/rasqal-install
+++ b/rasqal-install
@@ -5,25 +5,25 @@ DIR=`pwd`
 . ./utils.sh || (echo "Utils could not be loaded, check opentox-ui.sh." 1>&2 && exit 1)
 SELF=$(basename $0 -install)
 check_log $SELF
-check_utils "wget tar make"
+check_utils "wget tar make grep"
 
 # Build
 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*.tar.gz" && run_cmd "$cmd" "Unpack"
-rm $SELF*.tar.gz
-cd $SELF*
+cmd="$TAR xvzf $SELF-$RASQAL_VER.tar.gz" && run_cmd "$cmd" "Unpack"
+rm $SELF-$RASQAL_VER.tar.gz
+cd $SELF-$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"
 
 # Config
-echo "if echo \"\$LD_LIBRARY_PATH\" | grep -v \"$RASQAL_DIR/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"$RASQAL_DIR/lib:\$LD_LIBRARY_PATH\"; fi" >> "$RASQAL_CONF"
-echo "if echo \"\$PKG_CONFIG_PATH\" | grep -v \"$RASQAL_DIR/lib/pkgconfig\">/dev/null 2>&1; then export PKG_CONFIG_PATH=\"$RASQAL_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH\"; fi" >> "$RASQAL_CONF"
+echo "if echo \"\$LD_LIBRARY_PATH\" | $GREP -v \"$RASQAL_DIR/lib\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"$RASQAL_DIR/lib:\$LD_LIBRARY_PATH\"; fi" >> "$RASQAL_CONF"
+echo "if echo \"\$PKG_CONFIG_PATH\" | $GREP -v \"$RASQAL_DIR/lib/pkgconfig\">/dev/null 2>&1; then export PKG_CONFIG_PATH=\"$RASQAL_DIR/lib/pkgconfig:\$PKG_CONFIG_PATH\"; fi" >> "$RASQAL_CONF"
 echo "$SELF configuration has been stored in '$RASQAL_CONF'."
-if ! grep "$RASQAL_CONF" $OT_UI_CONF >/dev/null 2>&1; then
+if ! $GREP "$RASQAL_CONF" $OT_UI_CONF >/dev/null 2>&1; then
   echo '. '$RASQAL_CONF >> $OT_UI_CONF
 fi
 cd ..