diff options
author | Andreas Maunz <andreas@maunz.de> | 2011-04-07 08:50:06 +0200 |
---|---|---|
committer | Andreas Maunz <andreas@maunz.de> | 2011-04-07 08:50:06 +0200 |
commit | 1a36ef888295afd6592d617a7b3657386133d43f (patch) | |
tree | d65a58beb1f7e76ba4261f4831c55de258e7bc1c | |
parent | 721feafdb56c18fb7424d505377abe80d78f4e7b (diff) | |
parent | eb936c2d958e3ac2422bcecd073c8e0ef1a60abf (diff) |
Merge conflicts
-rw-r--r-- | README | 3 | ||||
-rw-r--r--[-rwxr-xr-x] | base-install.sh | 2 | ||||
-rwxr-xr-x | install | 1 | ||||
-rw-r--r--[-rwxr-xr-x] | kernlab.sh | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | redis.sh | 2 | ||||
-rwxr-xr-x | utils.sh | 7 |
6 files changed, 7 insertions, 8 deletions
@@ -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:" @@ -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 @@ -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 @@ -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" } |