From b345b0ee923cd089a58feb8eeaba19cebd7f08c1 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Tue, 29 Mar 2011 10:24:26 +0200
Subject: Making exec

---
 opentox-ruby.sh | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 opentox-ruby.sh

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From b4a59bb26442855916eebeea67cfc696e22c8faa Mon Sep 17 00:00:00 2001
From: Christoph Helma <helma@in-silico.ch>
Date: Tue, 29 Mar 2011 15:49:38 +0200
Subject: ESCAPEDSERVERNAME substitution fixed, PASSORD removed

---
 opentox-ruby.sh | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 6302009..70de013 100644
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -27,9 +27,8 @@ fi
 
 mkdir -p $HOME/.opentox/config
 mkdir -p $HOME/.opentox/log
-#sed -e "s/SERVERNAME/$servername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
-sed -e "s/PASSWORD/$password/;s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
-sed -e "s/PASSWORD/$password/;s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" aa-$install.yaml >> $HOME/.opentox/config/production.yaml
+sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
+sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" aa-$install.yaml >> $HOME/.opentox/config/production.yaml
 
 # checkout development version and link lib to opentox-ruby gem
 if [ $branch = "development" ]
-- 
cgit v1.2.3


From 90c34fd3fbb337df8edc6318a746a520432d0a3a Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Tue, 29 Mar 2011 16:00:11 +0200
Subject: opentox-ruby

---
 opentox-ruby.sh | 78 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 42 insertions(+), 36 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 6302009..c3efcb2 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -1,49 +1,55 @@
-#!/bin/sh
+#!/bin/bash
+#
+# Installs Opentox-ruby gem.
+# Author: Christoph Helma, Andreas Maunz.
+#
 
-echo "Installing opentox-ruby gem"
-. /etc/profile
-. ./config
-gem install opentox-ruby
-gem install builder # not included by spreadsheet gem
-
-dir=`pwd`
-
-# create config file
-servername=`hostname`.`dnsdomainname`
-escapedservername=`echo $servername|sed 's/\/\\\//'`
-if [ $branch = "development" ]
-then
-    logger=":logger: backtrace"
-else
-    logger=""
+if [ "$(id -u)" = "0" ]; then
+  echo "This script must be run as non-root." 1>&2
+  exit 1
 fi
 
-if [ $install = "server" ]
-then
-    aa="https:\/\/opensso.in-silico.ch"
-else
-    aa=nil
+# Utils
+GIT="`which git`"
+if [ ! -e "$GIT" ]; then
+  echo "'git' missing. Install 'git' first. Aborting..."
+  exit 1
 fi
 
-mkdir -p $HOME/.opentox/config
-mkdir -p $HOME/.opentox/log
-#sed -e "s/SERVERNAME/$servername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
-sed -e "s/PASSWORD/$password/;s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
-sed -e "s/PASSWORD/$password/;s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" aa-$install.yaml >> $HOME/.opentox/config/production.yaml
+# Pkg
+source ./config.sh
+
+
+echo "This installs the Opentox-ruby gem."
+echo "Press <Return> to continue, or <Ctrl+C> to abort."
+read
+
+DIR="`pwd`"
+
+gem install opentox-ruby
+gem install builder # not included by spreadsheet gem
+
+SERVERNAME="`hostname`"
+ESCAPED_SERVERNAME="`echo $SERVERNAME | sed 's/\/\\\//'`"
+LOGGER=":logger: backtrace"
+AA="nil"
+
+mkdir -p "$HOME/.opentox/config"
+mkdir -p "$HOME/.opentox/log"
+sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
+sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" aa-$install.yaml >> $HOME/.opentox/config/production.yaml
 
 # checkout development version and link lib to opentox-ruby gem
 if [ $branch = "development" ]
 then
-    mkdir -p /var/www/opentox
-    cd /var/www/opentox
-    git clone http://github.com/opentox/opentox-ruby.git 
+    mkdir -p $WWW_DEST/opentox
+    cd $WWW_DEST/opentox
+    $GIT clone http://github.com/opentox/opentox-ruby.git 
     cd opentox-ruby
-    git checkout -t origin/$branch
+    $GIT checkout -t origin/development
     gem install jeweler
     rake install
-    gem_lib=`gem which opentox-ruby`
-    gem_lib=`echo $gem_lib | sed 's/\/opentox-ruby.rb//'`
-    mv $gem_lib $gem_lib~
-    ln -s /var/www/opentox/opentox-ruby/lib $gem_lib
+    GEM_LIB=`gem which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
+    mv "$GEM_LIB" "$GEM_LIB~"
+    ln -s "$WWW_DEST/opentox/opentox-ruby/lib" "$GEM_LIB"
 fi
-cd $dir
-- 
cgit v1.2.3


From 3175afdf422f54e11eadecb535a52ecc00119418 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Wed, 30 Mar 2011 13:15:57 +0200
Subject: opentox-ruby

---
 opentox-ruby.sh | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index c3efcb2..ae8e08e 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -16,6 +16,19 @@ if [ ! -e "$GIT" ]; then
   exit 1
 fi
 
+GEM="`which gem`"
+if [ ! -e "$GEM" ]; then
+  echo "'gem' missing. Install 'gem' first. Aborting..."
+  exit 1
+fi
+
+RAKE="`which rake`"
+if [ ! -e "$RAKE" ]; then
+  echo "'rake' missing. Install 'rake' first. Aborting..."
+  exit 1
+fi
+
+
 # Pkg
 source ./config.sh
 
@@ -26,8 +39,8 @@ read
 
 DIR="`pwd`"
 
-gem install opentox-ruby
-gem install builder # not included by spreadsheet gem
+$GEM install opentox-ruby
+$GEM install builder # not included by spreadsheet gem
 
 SERVERNAME="`hostname`"
 ESCAPED_SERVERNAME="`echo $SERVERNAME | sed 's/\/\\\//'`"
@@ -44,12 +57,14 @@ if [ $branch = "development" ]
 then
     mkdir -p $WWW_DEST/opentox
     cd $WWW_DEST/opentox
-    $GIT clone http://github.com/opentox/opentox-ruby.git 
+    $GIT clone "http://github.com/opentox/opentox-ruby.git "
     cd opentox-ruby
-    $GIT checkout -t origin/development
-    gem install jeweler
-    rake install
-    GEM_LIB=`gem which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
+    $GIT checkout -t "origin/development"
+    $GEM install jeweler
+    $RAKE install
+    GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
     mv "$GEM_LIB" "$GEM_LIB~"
     ln -s "$WWW_DEST/opentox/opentox-ruby/lib" "$GEM_LIB"
 fi
+
+cd "$DIR"
-- 
cgit v1.2.3


From f043da5009a8358df1b33789b288aee3d1cb9c70 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Wed, 30 Mar 2011 13:18:47 +0200
Subject: opentox-ruby

---
 opentox-ruby.sh | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index ae8e08e..b4156c5 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -52,19 +52,15 @@ mkdir -p "$HOME/.opentox/log"
 sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
 sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" aa-$install.yaml >> $HOME/.opentox/config/production.yaml
 
-# checkout development version and link lib to opentox-ruby gem
-if [ $branch = "development" ]
-then
-    mkdir -p $WWW_DEST/opentox
-    cd $WWW_DEST/opentox
-    $GIT clone "http://github.com/opentox/opentox-ruby.git "
-    cd opentox-ruby
-    $GIT checkout -t "origin/development"
-    $GEM install jeweler
-    $RAKE install
-    GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
-    mv "$GEM_LIB" "$GEM_LIB~"
-    ln -s "$WWW_DEST/opentox/opentox-ruby/lib" "$GEM_LIB"
-fi
+mkdir -p $WWW_DEST/opentox
+cd $WWW_DEST/opentox
+$GIT clone "http://github.com/opentox/opentox-ruby.git "
+cd opentox-ruby
+$GIT checkout -t "origin/development"
+$GEM install jeweler
+$RAKE install
+GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
+mv "$GEM_LIB" "$GEM_LIB~"
+ln -s "$WWW_DEST/opentox/opentox-ruby/lib" "$GEM_LIB"
 
 cd "$DIR"
-- 
cgit v1.2.3


From 91154152cdca07690ddd91bb4d0dd686a4c7b5e0 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Wed, 30 Mar 2011 13:25:28 +0200
Subject: opentox-ruby

---
 opentox-ruby.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index b4156c5..d3d4c62 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -50,16 +50,18 @@ AA="nil"
 mkdir -p "$HOME/.opentox/config"
 mkdir -p "$HOME/.opentox/log"
 sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
-sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" aa-$install.yaml >> $HOME/.opentox/config/production.yaml
+sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" "aa-local.yaml" >> $HOME/.opentox/config/production.yaml
 
 mkdir -p $WWW_DEST/opentox
 cd $WWW_DEST/opentox
 $GIT clone "http://github.com/opentox/opentox-ruby.git "
 cd opentox-ruby
-$GIT checkout -t "origin/development"
+pwd
+$GIT checkout -t origin/development
 $GEM install jeweler
 $RAKE install
 GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
+echo "'$GEM_LIB'"
 mv "$GEM_LIB" "$GEM_LIB~"
 ln -s "$WWW_DEST/opentox/opentox-ruby/lib" "$GEM_LIB"
 
-- 
cgit v1.2.3


From ddad2649a837030a19ae1338243b76ab6a8e6104 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Wed, 30 Mar 2011 13:27:45 +0200
Subject: opentox-ruby

---
 opentox-ruby.sh | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index d3d4c62..930d226 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -57,6 +57,8 @@ cd $WWW_DEST/opentox
 $GIT clone "http://github.com/opentox/opentox-ruby.git "
 cd opentox-ruby
 pwd
+$GIT remote show origin
+$GIT fetch
 $GIT checkout -t origin/development
 $GEM install jeweler
 $RAKE install
-- 
cgit v1.2.3


From 914b26a1b03f8d3a0d8c46005dff53114b5af8ec Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Wed, 30 Mar 2011 13:30:08 +0200
Subject: opentox-ruby

---
 opentox-ruby.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 930d226..5ff89a0 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -59,7 +59,7 @@ cd opentox-ruby
 pwd
 $GIT remote show origin
 $GIT fetch
-$GIT checkout -t origin/development
+$GIT checkout -b development origin/development
 $GEM install jeweler
 $RAKE install
 GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
-- 
cgit v1.2.3


From 5ae9365231ce0727d28e589bfc2b9d0aeee6ceaa Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Wed, 30 Mar 2011 13:34:44 +0200
Subject: opentox-ruby

---
 opentox-ruby.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 5ff89a0..842c91f 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -54,7 +54,7 @@ sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGG
 
 mkdir -p $WWW_DEST/opentox
 cd $WWW_DEST/opentox
-$GIT clone "http://github.com/opentox/opentox-ruby.git "
+$GIT clone "git://github.com/opentox/opentox-ruby.git "
 cd opentox-ruby
 pwd
 $GIT remote show origin
-- 
cgit v1.2.3


From 89cadc0439892231757636fb64aeaf75d31416b8 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 31 Mar 2011 09:37:12 +0200
Subject: opentox-ruby.sh

---
 opentox-ruby.sh | 60 +++++++++++++++++++++++++++++++++------------------------
 1 file changed, 35 insertions(+), 25 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 842c91f..07bfb7b 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -31,40 +31,50 @@ fi
 
 # Pkg
 source ./config.sh
-
+source ./utils.sh
+LOG="/tmp/`basename $0`-log.txt"
 
 echo "This installs the Opentox-ruby gem."
+echo "Log file is '$LOG'."
 echo "Press <Return> to continue, or <Ctrl+C> to abort."
 read
 
 DIR="`pwd`"
 
-$GEM install opentox-ruby
-$GEM install builder # not included by spreadsheet gem
-
-SERVERNAME="`hostname`"
-ESCAPED_SERVERNAME="`echo $SERVERNAME | sed 's/\/\\\//'`"
-LOGGER=":logger: backtrace"
-AA="nil"
-
-mkdir -p "$HOME/.opentox/config"
-mkdir -p "$HOME/.opentox/log"
-sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
-sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVERNAME/$escapedservername/;s/LOGGER/$logger/;s/AA/$aa/" "aa-local.yaml" >> $HOME/.opentox/config/production.yaml
-
-mkdir -p $WWW_DEST/opentox
-cd $WWW_DEST/opentox
-$GIT clone "git://github.com/opentox/opentox-ruby.git "
-cd opentox-ruby
-pwd
-$GIT remote show origin
-$GIT fetch
-$GIT checkout -b development origin/development
-$GEM install jeweler
-$RAKE install
+for mygem in opentox-ruby builder jewler; do
+  if ! $GEM install $mygem>>$LOG 2>&1; then
+    printf "%25s%15s\n" "'Install $mygem'" "FAIL"
+  fi
+  printf "%25s%15s\n" "'Install $mygem'" "DONE"
+done
+
+
+servername="`hostname`"
+escapedserver="`echo $servername | sed 's/\/\\\//'`"
+logger=":logger: backtrace"
+aa="nil"
+
+mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1
+mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1
+sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml >>$LOG 2>&1
+sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/" aa-local.yaml >> $HOME/.opentox/config/production.yaml >>$LOG 2>&1
+
+mkdir -p $WWW_DEST/opentox >>$LOG 2>&1
+cd $WWW_DEST/opentox >>$LOG 2>&1
+$GIT clone "git://github.com/opentox/opentox-ruby.git " >>$LOG 2>&1
+cd opentox-ruby >>$LOG 2>&1
+$GIT checkout -b development origin/development>>$LOG 2>&1
+
+if ! $RAKE install >>$LOG 2>&1; then
+  printf "%25s%15s\n" "'Install opentox-ruby'" "FAIL"
+fi
+printf "%25s%15s\n" "'Install opentox-ruby'" "DONE"
+
 GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
-echo "'$GEM_LIB'"
 mv "$GEM_LIB" "$GEM_LIB~"
 ln -s "$WWW_DEST/opentox/opentox-ruby/lib" "$GEM_LIB"
 
 cd "$DIR"
+
+echo
+echo "Opentox-ruby gem finished."
-- 
cgit v1.2.3


From 6a1e6b30ca57920a461b713b2bf733ef7dbda210 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 31 Mar 2011 09:43:28 +0200
Subject: opentox-ruby.sh

---
 opentox-ruby.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 07bfb7b..550a636 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -41,9 +41,10 @@ read
 
 DIR="`pwd`"
 
-for mygem in opentox-ruby builder jewler; do
+for mygem in opentox-ruby builder jeweler; do
   if ! $GEM install $mygem>>$LOG 2>&1; then
     printf "%25s%15s\n" "'Install $mygem'" "FAIL"
+    exit 1
   fi
   printf "%25s%15s\n" "'Install $mygem'" "DONE"
 done
@@ -67,6 +68,7 @@ $GIT checkout -b development origin/development>>$LOG 2>&1
 
 if ! $RAKE install >>$LOG 2>&1; then
   printf "%25s%15s\n" "'Install opentox-ruby'" "FAIL"
+  exit 1
 fi
 printf "%25s%15s\n" "'Install opentox-ruby'" "DONE"
 
-- 
cgit v1.2.3


From 3d7eafe479f661495f7116e05955e63e143edfe8 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 31 Mar 2011 09:48:09 +0200
Subject: opentox-ruby.sh

---
 opentox-ruby.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 550a636..286facb 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -62,7 +62,7 @@ sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logg
 
 mkdir -p $WWW_DEST/opentox >>$LOG 2>&1
 cd $WWW_DEST/opentox >>$LOG 2>&1
-$GIT clone "git://github.com/opentox/opentox-ruby.git " >>$LOG 2>&1
+$GIT clone git://github.com/opentox/opentox-ruby.git >>$LOG 2>&1
 cd opentox-ruby >>$LOG 2>&1
 $GIT checkout -b development origin/development>>$LOG 2>&1
 
-- 
cgit v1.2.3


From 811111e8120218b5751e06b5ee31cef112ada3b5 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 31 Mar 2011 10:54:31 +0200
Subject: opentox-webservices.sh

---
 opentox-ruby.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 286facb..2404e5d 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -57,8 +57,8 @@ aa="nil"
 
 mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1
 mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1
-sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml >>$LOG 2>&1
-sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/" aa-local.yaml >> $HOME/.opentox/config/production.yaml >>$LOG 2>&1
+sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml 2>$LOG
+sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/" aa-local.yaml >> $HOME/.opentox/config/production.yaml 2>$LOG
 
 mkdir -p $WWW_DEST/opentox >>$LOG 2>&1
 cd $WWW_DEST/opentox >>$LOG 2>&1
-- 
cgit v1.2.3


From 312d93bcc322fa5aca38f38cd266569aaf18b621 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 31 Mar 2011 11:56:47 +0200
Subject: all

---
 opentox-ruby.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 2404e5d..00bf8f1 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -34,13 +34,11 @@ source ./config.sh
 source ./utils.sh
 LOG="/tmp/`basename $0`-log.txt"
 
-echo "This installs the Opentox-ruby gem."
-echo "Log file is '$LOG'."
-echo "Press <Return> to continue, or <Ctrl+C> to abort."
-read
-
+echo "Opentox-ruby ('$LOG'):"
 DIR="`pwd`"
 
+echo
+echo "Installing gem to pull dependencies:"
 for mygem in opentox-ruby builder jeweler; do
   if ! $GEM install $mygem>>$LOG 2>&1; then
     printf "%25s%15s\n" "'Install $mygem'" "FAIL"
@@ -55,6 +53,9 @@ escapedserver="`echo $servername | sed 's/\/\\\//'`"
 logger=":logger: backtrace"
 aa="nil"
 
+echo
+echo "Install:"
+
 mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1
 mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1
 sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml 2>$LOG
@@ -74,9 +75,11 @@ printf "%25s%15s\n" "'Install opentox-ruby'" "DONE"
 
 GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
 mv "$GEM_LIB" "$GEM_LIB~"
-ln -s "$WWW_DEST/opentox/opentox-ruby/lib" "$GEM_LIB"
+if ! ln -s "$WWW_DEST/opentox/opentox-ruby/lib" "$GEM_LIB"; then
+  printf "%25s%15s\n" "'Linking back'" "FAIL"
+fi
+printf "%25s%15s\n" "'Linking back'" "DONE"
+
 
 cd "$DIR"
 
-echo
-echo "Opentox-ruby gem finished."
-- 
cgit v1.2.3


From 59f6d70df510eb5e009f71a15ccbf20053ec7975 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 31 Mar 2011 12:42:16 +0200
Subject: all

---
 opentox-ruby.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 00bf8f1..0939635 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -4,6 +4,9 @@
 # Author: Christoph Helma, Andreas Maunz.
 #
 
+source ./config.sh
+source ./utils.sh
+
 if [ "$(id -u)" = "0" ]; then
   echo "This script must be run as non-root." 1>&2
   exit 1
@@ -30,8 +33,6 @@ fi
 
 
 # Pkg
-source ./config.sh
-source ./utils.sh
 LOG="/tmp/`basename $0`-log.txt"
 
 echo "Opentox-ruby ('$LOG'):"
-- 
cgit v1.2.3


From 6bcb46de198aff22039eeb40f2a4392421c823d8 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 31 Mar 2011 13:56:31 +0200
Subject: all

---
 opentox-ruby.sh | 21 +++++----------------
 1 file changed, 5 insertions(+), 16 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 0939635..45bcd3c 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -39,13 +39,9 @@ echo "Opentox-ruby ('$LOG'):"
 DIR="`pwd`"
 
 echo
-echo "Installing gem to pull dependencies:"
+echo "Gems:"
 for mygem in opentox-ruby builder jeweler; do
-  if ! $GEM install $mygem>>$LOG 2>&1; then
-    printf "%25s%15s\n" "'Install $mygem'" "FAIL"
-    exit 1
-  fi
-  printf "%25s%15s\n" "'Install $mygem'" "DONE"
+  cmd="$GEM install $mygem" && run_cmd "$cmd" "$mygem"
 done
 
 
@@ -68,19 +64,12 @@ $GIT clone git://github.com/opentox/opentox-ruby.git >>$LOG 2>&1
 cd opentox-ruby >>$LOG 2>&1
 $GIT checkout -b development origin/development>>$LOG 2>&1
 
-if ! $RAKE install >>$LOG 2>&1; then
-  printf "%25s%15s\n" "'Install opentox-ruby'" "FAIL"
-  exit 1
-fi
-printf "%25s%15s\n" "'Install opentox-ruby'" "DONE"
+cmd="$RAKE install" && run_cmd "$cmd" "Install"
 
 GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
-mv "$GEM_LIB" "$GEM_LIB~"
-if ! ln -s "$WWW_DEST/opentox/opentox-ruby/lib" "$GEM_LIB"; then
-  printf "%25s%15s\n" "'Linking back'" "FAIL"
-fi
-printf "%25s%15s\n" "'Linking back'" "DONE"
+mv "$GEM_LIB" "$GEM_LIB~" >>$LOG 2>&1
 
+cmd="ln -s $WWW_DEST/opentox/opentox-ruby/lib" && run_cmd "$cmd" "Linking back"
 
 cd "$DIR"
 
-- 
cgit v1.2.3


From 7578e353de1cde367e7fd08235e23b6e499c1197 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 31 Mar 2011 14:44:24 +0200
Subject: all

---
 opentox-ruby.sh | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 45bcd3c..843bfed 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -38,8 +38,6 @@ LOG="/tmp/`basename $0`-log.txt"
 echo "Opentox-ruby ('$LOG'):"
 DIR="`pwd`"
 
-echo
-echo "Gems:"
 for mygem in opentox-ruby builder jeweler; do
   cmd="$GEM install $mygem" && run_cmd "$cmd" "$mygem"
 done
@@ -50,9 +48,6 @@ escapedserver="`echo $servername | sed 's/\/\\\//'`"
 logger=":logger: backtrace"
 aa="nil"
 
-echo
-echo "Install:"
-
 mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1
 mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1
 sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml 2>$LOG
@@ -69,7 +64,7 @@ cmd="$RAKE install" && run_cmd "$cmd" "Install"
 GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
 mv "$GEM_LIB" "$GEM_LIB~" >>$LOG 2>&1
 
-cmd="ln -s $WWW_DEST/opentox/opentox-ruby/lib" && run_cmd "$cmd" "Linking back"
+cmd="ln -sf $WWW_DEST/opentox/opentox-ruby/lib $GEM_LIB" && run_cmd "$cmd" "Linking back"
 
 cd "$DIR"
 
-- 
cgit v1.2.3


From 2e0651a4b6da1bbae8f9556bab2d9330988b1dc8 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 31 Mar 2011 15:19:52 +0200
Subject: all

---
 opentox-ruby.sh | 1 +
 1 file changed, 1 insertion(+)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 843bfed..9f482a5 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -35,6 +35,7 @@ fi
 # Pkg
 LOG="/tmp/`basename $0`-log.txt"
 
+echo
 echo "Opentox-ruby ('$LOG'):"
 DIR="`pwd`"
 
-- 
cgit v1.2.3


From 1bca6beb732e7f5d19a1c49187fc56210b61bae0 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Fri, 1 Apr 2011 15:16:40 +0200
Subject: re-introduced branch check

---
 opentox-ruby.sh | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 9f482a5..1ba8523 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -40,32 +40,40 @@ echo "Opentox-ruby ('$LOG'):"
 DIR="`pwd`"
 
 for mygem in opentox-ruby builder jeweler; do
-  cmd="$GEM install $mygem" && run_cmd "$cmd" "$mygem"
+  if ! $GEM list | grep "$mygem" >/dev/null 2>&1; then
+    cmd="$GEM install $mygem" && run_cmd "$cmd" "$mygem"
+  fi
 done
 
 
 servername="`hostname`"
+serverdomain="`dnsdomainname`"
+if [ -n "$serverdomain" ]; then
+  servername="$servername"."$serverdomain"
+fi
 escapedserver="`echo $servername | sed 's/\/\\\//'`"
 logger=":logger: backtrace"
 aa="nil"
 
 mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1
 mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1
-sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml 2>$LOG
-sed -e "s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/" aa-local.yaml >> $HOME/.opentox/config/production.yaml 2>$LOG
-
-mkdir -p $WWW_DEST/opentox >>$LOG 2>&1
-cd $WWW_DEST/opentox >>$LOG 2>&1
-$GIT clone git://github.com/opentox/opentox-ruby.git >>$LOG 2>&1
-cd opentox-ruby >>$LOG 2>&1
-$GIT checkout -b development origin/development>>$LOG 2>&1
-
-cmd="$RAKE install" && run_cmd "$cmd" "Install"
 
-GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
-mv "$GEM_LIB" "$GEM_LIB~" >>$LOG 2>&1
-
-cmd="ln -sf $WWW_DEST/opentox/opentox-ruby/lib $GEM_LIB" && run_cmd "$cmd" "Linking back"
+cmd="sed -e \"s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
+cmd="sed -e \"s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/\" aa-local.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 2"
+
+if [ $OT_BRANCH = "development" ]; then
+  mkdir -p $WWW_DEST/opentox >>$LOG 2>&1
+  cd $WWW_DEST/opentox >>$LOG 2>&1
+  rm -rf opentox-ruby >>$LOG 2>&1
+  $GIT clone git://github.com/opentox/opentox-ruby.git >>$LOG 2>&1
+  cd opentox-ruby >>$LOG 2>&1
+  $GIT checkout -t origin/$OT_BRANCH >>$LOG 2>&1
+  cmd="$RAKE install" && run_cmd "$cmd" "Install"
+  GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
+  rm -rf "$GEM_LIB~" >>$LOG 2>&1
+  mv "$GEM_LIB" "$GEM_LIB~" >>$LOG 2>&1
+  cmd="ln -sf $WWW_DEST/opentox/opentox-ruby/lib $GEM_LIB" && run_cmd "$cmd" "Linking back"
+fi
 
 cd "$DIR"
 
-- 
cgit v1.2.3


From b69506cc0d7b3b2336444b6458cde7507388a8ca Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Fri, 1 Apr 2011 15:28:49 +0200
Subject: Removed sourcing of config.sh

---
 opentox-ruby.sh | 1 -
 1 file changed, 1 deletion(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 1ba8523..63fa158 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -4,7 +4,6 @@
 # Author: Christoph Helma, Andreas Maunz.
 #
 
-source ./config.sh
 source ./utils.sh
 
 if [ "$(id -u)" = "0" ]; then
-- 
cgit v1.2.3


From 7dacb96c5c4c46f8fd0c76bd26e5d37319bb5eb1 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Fri, 1 Apr 2011 15:37:43 +0200
Subject: all

---
 opentox-ruby.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 63fa158..492a167 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -4,7 +4,8 @@
 # Author: Christoph Helma, Andreas Maunz.
 #
 
-source ./utils.sh
+source "`pwd`/utils.sh"
+DIR="`pwd`"
 
 if [ "$(id -u)" = "0" ]; then
   echo "This script must be run as non-root." 1>&2
@@ -36,7 +37,6 @@ LOG="/tmp/`basename $0`-log.txt"
 
 echo
 echo "Opentox-ruby ('$LOG'):"
-DIR="`pwd`"
 
 for mygem in opentox-ruby builder jeweler; do
   if ! $GEM list | grep "$mygem" >/dev/null 2>&1; then
-- 
cgit v1.2.3


From 6e15685c0992a720507209c2c9b43a9c561ade5e Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Fri, 1 Apr 2011 16:27:53 +0200
Subject: Removed bashismsh

---
 opentox-ruby.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'opentox-ruby.sh')

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
-- 
cgit v1.2.3


From ed920f0ae3676d7fee9b3471cdb483ba222a16a1 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Fri, 1 Apr 2011 16:35:18 +0200
Subject: Re-enabled variable branching

---
 opentox-ruby.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index f7a470d..b27ef85 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -51,8 +51,18 @@ if [ -n "$serverdomain" ]; then
   servername="$servername"."$serverdomain"
 fi
 escapedserver="`echo $servername | sed 's/\/\\\//'`"
-logger=":logger: backtrace"
-aa="nil"
+
+if [ "$OT_BRANCH" = "development" ]; then
+  logger=":logger: backtrace"
+else
+  logger=""
+fi
+
+if [ "$OT_INSTALL" = "server" ]; then
+  aa="https:\/\/opensso.in-silico.ch"
+else
+  aa=nil
+fi
 
 mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1
 mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1
@@ -60,7 +70,7 @@ mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1
 cmd="sed -e \"s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
 cmd="sed -e \"s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/\" aa-local.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 2"
 
-if [ $OT_BRANCH = "development" ]; then
+if [ "$OT_BRANCH" = "development" ]; then
   mkdir -p $WWW_DEST/opentox >>$LOG 2>&1
   cd $WWW_DEST/opentox >>$LOG 2>&1
   rm -rf opentox-ruby >>$LOG 2>&1
-- 
cgit v1.2.3


From 1e9174342a0bae9b7e00c6d81a8271934a90baf7 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 7 Apr 2011 16:31:38 +0200
Subject: Fixed replacing WWW_DEST

---
 opentox-ruby.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index b27ef85..692cc61 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -67,8 +67,8 @@ fi
 mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1
 mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1
 
-cmd="sed -e \"s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
-cmd="sed -e \"s/SERVERNAME/$servername/;s/ESCAPEDSERVER/$escapedserver/;s/LOGGER/$logger/;s/AA/$aa/\" aa-local.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 2"
+cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
+cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,\" aa-$OT_INSTALL.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
 
 if [ "$OT_BRANCH" = "development" ]; then
   mkdir -p $WWW_DEST/opentox >>$LOG 2>&1
-- 
cgit v1.2.3


From 7b37b2c92dc746446b6110eab2038254bd704a11 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Thu, 28 Apr 2011 12:48:20 +0200
Subject: Fixed checkout usage

---
 opentox-ruby.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 3811484..607cf18 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -76,7 +76,7 @@ if [ "$OT_BRANCH" = "development" ]; then
   rm -rf opentox-ruby >>$LOG 2>&1
   $GIT clone git://github.com/opentox/opentox-ruby.git >>$LOG 2>&1
   cd opentox-ruby >>$LOG 2>&1
-  $GIT checkout -t origin/$OT_BRANCH >>$LOG 2>&1
+  $GIT checkout -b $OT_BRANCH origin/$OT_BRANCH >>$LOG 2>&1
   cmd="$RAKE install" && run_cmd "$cmd" "Install"
   GEM_LIB=`$GEM which opentox-ruby | sed 's/\/opentox-ruby.rb//'`
   rm -rf "$GEM_LIB~" >>$LOG 2>&1
-- 
cgit v1.2.3


From 5c4240c295466fe56dea73b26710a9798c8570e6 Mon Sep 17 00:00:00 2001
From: mguetlein <martin.guetlein@gmail.com>
Date: Tue, 3 May 2011 14:21:48 +0200
Subject: replace nil with empty-string when aa is not used in yaml-config

---
 opentox-ruby.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 607cf18..d101600 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -8,7 +8,7 @@
 DIR="`pwd`"
 
 if [ "$(id -u)" = "0" ]; then
-  echo "This script must be run as non-root." 1>&2
+  echo "This script must be run as non-root." 1>&264
   exit 1
 fi
 
@@ -61,7 +61,7 @@ fi
 if [ "$OT_INSTALL" = "server" ]; then
   aa="https:\/\/opensso.in-silico.ch"
 else
-  aa=nil
+  aa=""
 fi
 
 mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1
-- 
cgit v1.2.3


From 76dd98a2fcfa07bab5424b9ce74bf8825d4b5a8c Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Tue, 3 May 2011 14:25:33 +0200
Subject: Fixed redirection

---
 opentox-ruby.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index d101600..5fcff1c 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -8,7 +8,7 @@
 DIR="`pwd`"
 
 if [ "$(id -u)" = "0" ]; then
-  echo "This script must be run as non-root." 1>&264
+  echo "This script must be run as non-root." 1>&2
   exit 1
 fi
 
-- 
cgit v1.2.3


From 2a9154ab9115f86d5824e5424d164c98624a6545 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Tue, 17 May 2011 01:19:19 -0700
Subject: Supporting release branch for backlinking

---
 opentox-ruby.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100755 => 100644 opentox-ruby.sh

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
old mode 100755
new mode 100644
index 5fcff1c..08c37ef
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -70,7 +70,7 @@ mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1
 cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
 cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,\" aa-$OT_INSTALL.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
 
-if [ "$OT_BRANCH" = "development" ]; then
+if [ "$OT_BRANCH" = "development" ] || expr match "$OT_BRANCH" "release"; then
   mkdir -p $WWW_DEST/opentox >>$LOG 2>&1
   cd $WWW_DEST/opentox >>$LOG 2>&1
   rm -rf opentox-ruby >>$LOG 2>&1
-- 
cgit v1.2.3


From 7d7ed42d8700c4980c767d2904cd6696cd80a3b2 Mon Sep 17 00:00:00 2001
From: Andreas Maunz <andreas@maunz.de>
Date: Wed, 18 May 2011 09:29:09 +0200
Subject: Checking out production.yaml as template

---
 opentox-ruby.sh | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'opentox-ruby.sh')

diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 5fcff1c..adccf4d 100755
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -67,6 +67,9 @@ fi
 mkdir -p "$HOME/.opentox/config" >>$LOG 2>&1
 mkdir -p "$HOME/.opentox/log" >>$LOG 2>&1
 
+$GIT checkout production.yaml      >>$LOG 2>&1
+$GIT checkout aa-$OT_INSTALL.yaml  >>$LOG 2>&1
+
 cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,\" production.yaml > $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
 cmd="sed -e \"s,SERVERNAME,$servername,;s,ESCAPEDSERVER,$escapedserver,;s,LOGGER,$logger,;s,AA,$aa,;s,WWW_DEST,$WWW_DEST,\" aa-$OT_INSTALL.yaml >> $HOME/.opentox/config/production.yaml" && run_cmd "$cmd" "Config 1"
 
-- 
cgit v1.2.3