Replaced substring matching by grep

5 files changed, 8 insertions, 9 deletions

diff --git a/base-install.sh b/base-install.sh
index 7fdb824..60e4715 100755
--- a/base-install.sh
+++ b/base-install.sh
@@ -26,7 +26,7 @@ fi
 
 
 # Pkgs
-packs="lsb-release binutils gcc g++ gfortran wget hostname pwgen git-core raptor-utils r-base sun-java6-jdk libssl-dev zlib1g-dev libreadline-dev libmysqlclient-dev libcurl4-openssl-dev libxml2-dev libxslt1-dev libgsl0-dev sun-java6-jdk"
+packs="lsb-release binutils gcc g++ gfortran wget hostname pwgen git-core raptor-utils r-base sun-java6-jdk libssl-dev zlib1g-dev libreadline-dev libmysqlclient-dev libcurl4-openssl-dev libxml2-dev libxslt1-dev libgsl0-dev sun-java6-jdk libreadline-5.dev"
 
 echo
 echo "Base Packages:"
@@ -81,8 +81,8 @@ if [ ! -f $JAVA_CONF ]; then
     exit 1
   fi
 
-  echo "if ! [[ \"\$JAVA_HOME\" =~ \"$JAVA_HOME\" ]]; then export JAVA_HOME=\"$JAVA_HOME\"; fi" >> "$JAVA_CONF"
-  echo "if ! [[ \"\$PATH\" =~ \"$JAVA_HOME\" ]]; then export PATH=\"$JAVA_HOME:\$PATH\"; fi" >> "$JAVA_CONF"
+  echo "if echo \"\$JAVA_HOME\" | grep -v \"$JAVA_HOME\">/dev/null 2>&1; then export JAVA_HOME=\"$JAVA_HOME\"; fi" >> "$JAVA_CONF"
+  echo "if echo \"\$PATH\" | grep -v \"$JAVA_HOME\"; then export PATH=\"$JAVA_HOME:\$PATH\"; fi" >> "$JAVA_CONF"
 
   echo "Java configuration has been stored in '$JAVA_CONF'."
   if ! grep "$JAVA_CONF" $HOME/.bashrc >/dev/null 2>&1; then
diff --git a/kernlab.sh b/kernlab.sh
index 10141e2..4267a86 100755
--- a/kernlab.sh
+++ b/kernlab.sh
@@ -57,7 +57,7 @@ fi
 
 if [ ! -f $KL_CONF ]; then
 
-  echo "if ! [[ \"\$R_LIBS\" =~ \"$KL_DEST\" ]]; then export R_LIBS=\"$KL_DEST\"; fi" >> "$KL_CONF"
+  echo "if echo \"\$R_LIBS\" | grep -v \"$KL_DEST\">/dev/null 2>&1; then export R_LIBS=\"$KL_DEST\"; fi" >> "$KL_CONF"
   echo "R package destination has been stored in '$KL_CONF'."
 
   if ! grep "$KL_CONF" $HOME/.bashrc >/dev/null 2>&1 ; then
diff --git a/openbabel.sh b/openbabel.sh
index 9e16b1d..cbc0f01 100755
--- a/openbabel.sh
+++ b/openbabel.sh
@@ -53,8 +53,8 @@ fi
 
 if [ ! -f "$OB_CONF" ]; then
 
-  echo "if ! [[ \"\$PATH\" =~ \"$OB_DEST\" ]]; then export PATH=\"$OB_DEST/bin:\$PATH\"; fi" >> "$OB_CONF"
-  echo "if ! [[ \"\$LD_LIBRARY_PATH\" =~ \"$OB_DEST\" ]]; then export LD_LIBRARY_PATH=\"$OB_DEST/lib:\$LD_LIBRARY_PATH\"; fi" >> "$OB_CONF"
+  echo "if echo \"\$PATH\" | grep -v \"$OB_DEST\">/dev/null 2>&1; then export PATH=\"$OB_DEST/bin:\$PATH\"; fi" >> "$OB_CONF"
+  echo "if echo \"\$LD_LIBRARY_PATH\" | grep -v \"$OB_DEST\">/dev/null 2>&1; then export LD_LIBRARY_PATH=\"$OB_DEST/lib:\$LD_LIBRARY_PATH\"; fi" >> "$OB_CONF"
   echo "if [ -z \"\$BABEL_LIBDIR\" ]; then export BABEL_LIBDIR=\"$OB_DEST/lib/openbabel/2.3.0\"; fi" >> "$OB_CONF"
   echo "if [ -z \"\$BABEL_DATADIR\" ]; then export BABEL_DATADIR=\"$OB_DEST/share/openbabel/2.3.0\"; fi" >> "$OB_CONF"
   echo "if [ -z \"\$RUBYLIB\" ]; then export RUBYLIB=\"$OB_DEST_BINDINGS\"; fi" >> "$RUBY_CONF"
diff --git a/opentox-webservices.sh b/opentox-webservices.sh
index 71bef01..fb733e8 100755
--- a/opentox-webservices.sh
+++ b/opentox-webservices.sh
@@ -27,7 +27,7 @@ fi
 
 LOG="/tmp/`basename $0`-log.txt"
 
-if ! id opentox; then
+if ! id opentox >>$LOG 2>&1; then
   cmd="sudo adduser --system opentox" && run_cmd "$cmd" "User 'opentox'"
 fi
 
diff --git a/ruby.sh b/ruby.sh
index fede4cb..bb7ee90 100644
--- a/ruby.sh
+++ b/ruby.sh
@@ -50,8 +50,7 @@ fi
 
 
 if ! [ -f "$RUBY_CONF" ]; then
-
-  echo "if ! [[ \"\$PATH\" =~ \"$RUBY_DEST\" ]]; then export PATH=\"$RUBY_DEST/bin:\$PATH\"; fi" >> "$RUBY_CONF"
+  echo "if echo \"\$PATH\" | grep -v \"$RUBY_DEST\">/dev/null 2>&1; then export PATH=\"$RUBY_DEST/bin:\$PATH\"; fi" >> "$RUBY_CONF"
 
   echo "Ruby configuration has been stored in '$RUBY_CONF'."
   if ! grep "$RUBY_CONF" $HOME/.bashrc >/dev/null 2>&1 ; then