Removed bashismsh

10 files changed, 30 insertions, 30 deletions

diff --git a/base-install.sh b/base-install.sh
index 18d8170..7fdb824 100755
--- a/base-install.sh
+++ b/base-install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Installs base packages for Ubuntu
 # Author: Andreas Maunz
@@ -6,7 +6,7 @@
 # Your installed packages are safe and will not be updated.
 # A Java configuration is created and included in your '~.bashrc'.
 
-source "`pwd`/utils.sh"
+. "`pwd`/utils.sh"
 DIR="`pwd`"
 
 if [ "$(id -u)" = "0" ]; then
@@ -60,8 +60,8 @@ done
 if [ -n "$pack_fail" ]; then
   echo 
   echo "WARNING: At least one missing package has no suitable installation candidate."
-  echo "Press <Return> to continue or <Ctrl+C> to abort."
-  read 
+  echo "Press <Ctrl+C> to abort (5 sec)."
+  sleep 5
 fi
 
 echo sun-java6-jdk shared/accepted-sun-dlj-v1-1 select true | sudo /usr/bin/debconf-set-selections
@@ -86,7 +86,7 @@ if [ ! -f $JAVA_CONF ]; then
 
   echo "Java configuration has been stored in '$JAVA_CONF'."
   if ! grep "$JAVA_CONF" $HOME/.bashrc >/dev/null 2>&1; then
-    echo "source \"$JAVA_CONF\"" >> $HOME/.bashrc
+    echo ". \"$JAVA_CONF\"" >> $HOME/.bashrc
   fi
 fi
 
diff --git a/config.sh b/config.sh
index 72c3fec..244ab37 100644
--- a/config.sh
+++ b/config.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Configuration file for Opentox installer.
 # Author: Christoph Helma, Andreas Maunz.
diff --git a/kernlab.sh b/kernlab.sh
index 395d49a..10141e2 100755
--- a/kernlab.sh
+++ b/kernlab.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Installs Kernlab.
 # Author: Christoph Helma, Andreas Maunz.
 #
 
-source "`pwd`/utils.sh"
+. "`pwd`/utils.sh"
 DIR="`pwd`"
 
 if [ "$(id -u)" = "0" ]; then
@@ -61,7 +61,7 @@ if [ ! -f $KL_CONF ]; then
   echo "R package destination has been stored in '$KL_CONF'."
 
   if ! grep "$KL_CONF" $HOME/.bashrc >/dev/null 2>&1 ; then
-    echo "source \"$KL_CONF\"" >> $HOME/.bashrc
+    echo ". \"$KL_CONF\"" >> $HOME/.bashrc
   fi
 
 fi
diff --git a/nginx.sh b/nginx.sh
index fb0bc9b..3aefac0 100755
--- a/nginx.sh
+++ b/nginx.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Installs Passenger.
 # Author: Christoph Helma, Andreas Maunz.
 #
 
-source "`pwd`/utils.sh"
+. "`pwd`/utils.sh"
 DIR="`pwd`"
 
 if [ "$(id -u)" = "0" ]; then
diff --git a/openbabel.sh b/openbabel.sh
index 4f8c2ee..9e16b1d 100755
--- a/openbabel.sh
+++ b/openbabel.sh
@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Installs Openbabel.
 # A configuration file is created and included in your '~.bashrc'.
 # Author: Christoph Helma, Andreas Maunz.
 #
 
-source "`pwd`/utils.sh"
+. "`pwd`/utils.sh"
 DIR="`pwd`"
 
 if [ "$(id -u)" = "0" ]; then
@@ -61,14 +61,14 @@ if [ ! -f "$OB_CONF" ]; then
 
   echo "Openbabel configuration has been stored in '$OB_CONF'."
   if ! grep "$OB_CONF" $HOME/.bashrc >/dev/null 2>&1 ; then
-    echo "source \"$OB_CONF\"" >> $HOME/.bashrc
+    echo ". \"$OB_CONF\"" >> $HOME/.bashrc
   fi
 
 fi
 
 echo "Bindings:"
 OB_DONE=false
-source "$HOME/.bashrc"
+. "$HOME/.bashrc"
 mkdir "$OB_DEST_BINDINGS">/dev/null 2>&1
 if [ ! -d "$OB_DEST_BINDINGS" ]; then
   echo "Install directory '$OB_DEST_BINDINGS' is not available! Aborting..."
diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 492a167..f7a470d 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Installs Opentox-ruby gem.
 # Author: Christoph Helma, Andreas Maunz.
 #
 
-source "`pwd`/utils.sh"
+. "`pwd`/utils.sh"
 DIR="`pwd`"
 
 if [ "$(id -u)" = "0" ]; then
diff --git a/opentox-webservices.sh b/opentox-webservices.sh
index cbb9fd3..583ea7c 100755
--- a/opentox-webservices.sh
+++ b/opentox-webservices.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Installs Opentox Webservices.
 # Author: Christoph Helma, Andreas Maunz.
 #
 
-source "`pwd`/utils.sh"
+. "`pwd`/utils.sh"
 DIR=`pwd`
 
 if [ "$(id -u)" = "0" ]; then
diff --git a/redis.sh b/redis.sh
index b669bee..503cfca 100755
--- a/redis.sh
+++ b/redis.sh
@@ -1,10 +1,10 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Installs Redis.
 # Author: Christoph Helma, Andreas Maunz.
 #
 
-source "`pwd`/utils.sh"
+. "`pwd`/utils.sh"
 DIR=`pwd`
 
 if [ "$(id -u)" = "0" ]; then
@@ -63,8 +63,8 @@ if [ ! -f $REDIS_CONF ]; then
   echo "export PATH=$REDIS_DEST/src:\$PATH" >> "$REDIS_CONF"
   echo "Redis configuration has been stored in '$REDIS_CONF'."
 
-  if ! grep "source \"$REDIS_CONF\"" $HOME/.bashrc; then
-    echo "source \"$REDIS_CONF\"" >> $HOME/.bashrc
+  if ! grep ". \"$REDIS_CONF\"" $HOME/.bashrc; then
+    echo ". \"$REDIS_CONF\"" >> $HOME/.bashrc
   fi
 
 fi
diff --git a/ruby.sh b/ruby.sh
index 2c073db..87e87b7 100755
--- a/ruby.sh
+++ b/ruby.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # Installs Ruby enterprise edition and passenger gem.
 # A configuration file is created and included in your '~.bashrc'.
@@ -6,7 +6,7 @@
 # Author: Christoph Helma, Andreas Maunz.
 #
 
-source "`pwd`/utils.sh"
+. "`pwd`/utils.sh"
 DIR="`pwd`"
 
 if [ "$(id -u)" = "0" ]; then
@@ -56,10 +56,10 @@ if ! [ -f "$RUBY_CONF" ]; then
 
   echo "Ruby configuration has been stored in '$RUBY_CONF'."
   if ! grep "$RUBY_CONF" $HOME/.bashrc >/dev/null 2>&1 ; then
-    echo "source \"$RUBY_CONF\"" >> $HOME/.bashrc
+    echo ". \"$RUBY_CONF\"" >> $HOME/.bashrc
   fi
 fi
-source "$RUBY_CONF"
+. "$RUBY_CONF"
 
 
 GEM="`which gem`"
diff --git a/utils.sh b/utils.sh
index b49e6fc..8c3d633 100644
--- a/utils.sh
+++ b/utils.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 check_dest() 
 {
@@ -32,6 +32,6 @@ abs_path()
   esac
 }
 
-source "$HOME/.bashrc"
-source "`pwd`/config.sh"
+. "$HOME/.bashrc"
+. "`pwd`/config.sh"
 check_dest