summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README3
-rw-r--r--[-rwxr-xr-x]base-install.sh2
-rwxr-xr-xinstall1
-rw-r--r--[-rwxr-xr-x]kernlab.sh0
-rw-r--r--[-rwxr-xr-x]redis.sh2
-rwxr-xr-xutils.sh7
6 files changed, 7 insertions, 8 deletions
diff --git a/README b/README
index e4d2f1c..3aa4274 100644
--- a/README
+++ b/README
@@ -7,8 +7,7 @@ Installer for OpenTox IST/ALU Services
Usage
-----
-tested with Debian Squeeze, might work for Ubuntu and other Debian based distributions
-For Ubuntu Carmic, you need to install libblas-dev first.
+tested with Debian Squeeze, might work for Ubuntu and other Debian based distributions.
git clone http://github.com/opentox/install.git
cd install
diff --git a/base-install.sh b/base-install.sh
index 22edce9..03512fe 100755..100644
--- a/base-install.sh
+++ b/base-install.sh
@@ -27,7 +27,7 @@ fi
touch $OT_UI_CONF
# 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 libreadline5-dev"
+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 libreadline5-dev r-base-dev "
echo
echo "Base Packages:"
diff --git a/install b/install
index a43e507..e5bf991 100755
--- a/install
+++ b/install
@@ -3,6 +3,7 @@
# Author: Christoph Helma, Andreas Maunz
LOG="/tmp/`basename $0`-log.txt"
+touch $HOME/.bashrc
. "./utils.sh"
echo "Opentox-ruby installation."
echo "You may need to give root password for some privileged actions right now:"
diff --git a/kernlab.sh b/kernlab.sh
index a49635f..a49635f 100755..100644
--- a/kernlab.sh
+++ b/kernlab.sh
diff --git a/redis.sh b/redis.sh
index 330bfa4..d4d2f05 100755..100644
--- a/redis.sh
+++ b/redis.sh
@@ -33,8 +33,6 @@ if [ ! -d "$REDIS_DEST" ]; then
else
if ! rmdir "$REDIS_DEST" >/dev/null 2>&1; then # if not empty this will fail
REDIS_DONE=true
- else
- mkdir "$REDIS_DEST" >/dev/null 2>&1
fi
fi
diff --git a/utils.sh b/utils.sh
index cff99da..2a17452 100755
--- a/utils.sh
+++ b/utils.sh
@@ -15,11 +15,12 @@ run_cmd ()
local cmd="$1"
local title="$2"
- if ! eval $cmd >>$LOG 2>&1 ; then
- printf "%25s%15s\n" "'$title'" "FAIL"
+ printf "%15s" "'$title'"
+ if ! eval $cmd >>$LOG 2>&1 ; then
+ printf "%25s\n" "FAIL"
exit 1
fi
- printf "%25s%15s\n" "'$title'" "DONE"
+ printf "%25s\n" "DONE"
}