From 22183f38807f2524527c57df4c2e9d207b30725b Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Mon, 26 Mar 2012 17:36:27 +0200 Subject: Fixed some conditions, e.g. length of string --- bin/algorithm-install | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bin/algorithm-install b/bin/algorithm-install index 2645d1c..77cb3d3 100755 --- a/bin/algorithm-install +++ b/bin/algorithm-install @@ -46,7 +46,7 @@ run_cmd () install_ruby() { printf "\n%50s\n" "RUBY" local DIR=`pwd` - if ! [ $RBENV versions $RUBY_VER | grep $RUBY_VER>/dev/null ]; then + if ! $RBENV versions $RUBY_VER | grep $RUBY_VER>/dev/null 2>&1; then [ -d $DIR/tmp ] || mkdir -p $DIR/tmp && cd $DIR/tmp ([ -d $DIR/tmp/ruby-$RUBY_VER ] || $CURL $RUBY_DWL/ruby-$RUBY_VER.tar.gz 2>/dev/null | tar xz) && cd ruby-$RUBY_VER cmd="./configure --prefix=$RUBY_DIR" && run_cmd "$cmd" "Configure" @@ -120,9 +120,9 @@ echo [ -d $OT_CONFIG/log ] || cmd="mkdir -p $OT_CONFIG/log" && run_cmd "$cmd" "Main log directory" [ -d $OT_CONFIG/config/$SELF ] || cmd="mkdir -p $OT_CONFIG/config/$SELF" && run_cmd "$cmd" "$SELF config directory" -[ "`$RBENV local`" = "$RUBY_VER" ] || install_ruby -[ -n `find $RUBY_DIR -name openbabel.so 2>/dev/null` ] || install_ob_ruby -( [ -n `find libfminer/ -name bbrc.so 2>/dev/null` ] && [ -n `find libfminer/ -name last.so 2>/dev/null` ] ) || install_fminer +[ "`$RBENV local 2>/dev/null`" = "$RUBY_VER" ] || install_ruby +[ -n "`find $RUBY_DIR -name openbabel.so 2>/dev/null`" ] || install_ob_ruby +( [ -n "`find libfminer/ -name bbrc.so 2>/dev/null`" ] && [ -n "`find libfminer/ -name last.so 2>/dev/null`" ] ) || install_fminer echo install_bundler -- cgit v1.2.3