From ce1b627f4c2e6c7648b6dae24b296c56c9058285 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Tue, 29 Mar 2011 10:19:55 +0200 Subject: Installer up to OB --- install | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'install') diff --git a/install b/install index 9e72d13..d9cd3f2 100755 --- a/install +++ b/install @@ -1,7 +1,13 @@ -#!/bin/sh +#!/bin/bash +# Main Opentox-ruby install script +# Author: Christoph Helma, Andreas Maunz + +echo "Opentox-ruby installation" +echo "Press to continue..." +read . ./config -. ./$distribution.sh +. ./base-install.sh $distribution # Pass as parameter . ./ruby.sh . ./openbabel.sh . ./kernlab.sh -- cgit v1.2.3 From 32a196c74bf552a4c0e43f4fc45866cffd6caf2a Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Wed, 30 Mar 2011 15:01:12 +0200 Subject: install --- install | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'install') diff --git a/install b/install index d9cd3f2..acdd503 100755 --- a/install +++ b/install @@ -6,21 +6,17 @@ echo "Opentox-ruby installation" echo "Press to continue..." read -. ./config -. ./base-install.sh $distribution # Pass as parameter -. ./ruby.sh -. ./openbabel.sh -. ./kernlab.sh -. ./opentox-ruby.sh +. "./config" +. "./base-install.sh" $distribution # Pass as parameter +. "./ruby.sh" +. "./openbabel.sh" +. "./kernlab.sh" +. "./opentox-ruby.sh" if [ $install != "gem" ] then - . ./nginx.sh - . ./redis.sh - . ./opentox-webservices.sh - #. ./mysql-setup.sh - echo "Starting Nginx" - echo "Please inspect and tune /opt/nginx/conf/nginx.conf and /home/opentox/.opentox/config/production.yaml" - /opt/nginx/sbin/nginx + . "./nginx.sh" + . "./redis.sh" + . "./opentox-webservices.sh" fi -- cgit v1.2.3 From 16cfa7f673220db44079443dcd8a7f2585a6fba5 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Wed, 30 Mar 2011 16:04:11 +0200 Subject: base-install --- install | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'install') diff --git a/install b/install index acdd503..2285107 100755 --- a/install +++ b/install @@ -6,17 +6,17 @@ echo "Opentox-ruby installation" echo "Press to continue..." read -. "./config" -. "./base-install.sh" $distribution # Pass as parameter -. "./ruby.sh" -. "./openbabel.sh" -. "./kernlab.sh" -. "./opentox-ruby.sh" +source "./config" +source "./base-install.sh" +source "./ruby.sh" +source "./openbabel.sh" +source "./kernlab.sh" +source "./opentox-ruby.sh" if [ $install != "gem" ] then - . "./nginx.sh" - . "./redis.sh" - . "./opentox-webservices.sh" + source "./nginx.sh" + source "./redis.sh" + source "./opentox-webservices.sh" fi -- cgit v1.2.3 From 2e0651a4b6da1bbae8f9556bab2d9330988b1dc8 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 31 Mar 2011 15:19:52 +0200 Subject: all --- install | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'install') diff --git a/install b/install index 2285107..d6422a5 100755 --- a/install +++ b/install @@ -2,9 +2,11 @@ # Main Opentox-ruby install script # Author: Christoph Helma, Andreas Maunz -echo "Opentox-ruby installation" -echo "Press to continue..." -read +LOG="/tmp/`basename $0`-log.txt" +source ./utils.sh +echo "Opentox-ruby installation." +echo "You may need to give root password for some privileged actions right now:" +cmd="sudo echo -n \"\"" && run_cmd "$cmd" "Acquire privileges" source "./config" source "./base-install.sh" -- cgit v1.2.3 From 8f6e83bb4202ee936b1efe9d45984158a91d140e Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Fri, 1 Apr 2011 15:24:10 +0200 Subject: Removed config --- install | 1 - 1 file changed, 1 deletion(-) (limited to 'install') diff --git a/install b/install index d6422a5..036e477 100755 --- a/install +++ b/install @@ -8,7 +8,6 @@ echo "Opentox-ruby installation." echo "You may need to give root password for some privileged actions right now:" cmd="sudo echo -n \"\"" && run_cmd "$cmd" "Acquire privileges" -source "./config" source "./base-install.sh" source "./ruby.sh" source "./openbabel.sh" -- cgit v1.2.3 From dac77af34f7ed10223b1fe31d658df0c2b64c23f Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Fri, 1 Apr 2011 15:39:29 +0200 Subject: all --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install') diff --git a/install b/install index 036e477..2101702 100755 --- a/install +++ b/install @@ -14,7 +14,7 @@ source "./openbabel.sh" source "./kernlab.sh" source "./opentox-ruby.sh" -if [ $install != "gem" ] +if [ "$install" != "gem" ] then source "./nginx.sh" source "./redis.sh" -- cgit v1.2.3 From 29ebfc2eb3612d57ec9ef6b1aa1fddee8acebff3 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Sat, 2 Apr 2011 00:01:17 -0700 Subject: removed source --- install | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) mode change 100755 => 100644 install (limited to 'install') diff --git a/install b/install old mode 100755 new mode 100644 index 2101702..00f72e0 --- a/install +++ b/install @@ -3,21 +3,21 @@ # Author: Christoph Helma, Andreas Maunz LOG="/tmp/`basename $0`-log.txt" -source ./utils.sh +. "./utils.sh" echo "Opentox-ruby installation." echo "You may need to give root password for some privileged actions right now:" cmd="sudo echo -n \"\"" && run_cmd "$cmd" "Acquire privileges" -source "./base-install.sh" -source "./ruby.sh" -source "./openbabel.sh" -source "./kernlab.sh" -source "./opentox-ruby.sh" +. "./base-install.sh" +. "./ruby.sh" +. "./openbabel.sh" +. "./kernlab.sh" +. "./opentox-ruby.sh" if [ "$install" != "gem" ] then - source "./nginx.sh" - source "./redis.sh" - source "./opentox-webservices.sh" + . "./nginx.sh" + . "./redis.sh" + . "./opentox-webservices.sh" fi -- cgit v1.2.3 From b2d9ab87690a05ed6356c5b5413ef1e65c929c9d Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Sat, 2 Apr 2011 00:01:39 -0700 Subject: Correct shebang --- install | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'install') diff --git a/install b/install index 00f72e0..a43e507 100644 --- a/install +++ b/install @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh # Main Opentox-ruby install script # Author: Christoph Helma, Andreas Maunz -- cgit v1.2.3 From 6658fc2ba50d25fd636772201a20b464bce21311 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Sat, 2 Apr 2011 07:50:42 -0700 Subject: touch .bashrc --- install | 1 + 1 file changed, 1 insertion(+) (limited to 'install') diff --git a/install b/install index a43e507..e5bf991 100644 --- 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:" -- cgit v1.2.3 From f1b3c4ae8fad84b70ed996758925a3d1ad31b6a3 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 08:40:06 +0200 Subject: Changed exec status --- install | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 install (limited to 'install') diff --git a/install b/install old mode 100644 new mode 100755 -- cgit v1.2.3 From 26a6fb6e8fe83a3f2526025c812b87cf61a326ab Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 09:01:59 +0200 Subject: Fixed hints --- install | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'install') diff --git a/install b/install index e5bf991..bb0da33 100755 --- a/install +++ b/install @@ -22,3 +22,9 @@ then . "./opentox-webservices.sh" fi +echo +echo "Installation finished and configured." +echo +echo "IMPORTANT:" +echo "Include the file '$OT_UI_CONF' in your shell or system startup to have it automatically configured." +echo -- cgit v1.2.3 From 2cce008585e5236a61e94a6571afcc3c110b6512 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 09:13:37 +0200 Subject: Fixed install include --- install | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'install') diff --git a/install b/install index bb0da33..903dd67 100755 --- a/install +++ b/install @@ -3,7 +3,8 @@ # Author: Christoph Helma, Andreas Maunz LOG="/tmp/`basename $0`-log.txt" -touch $HOME/.bashrc +touch "$OT_UI_CONF" + . "./utils.sh" echo "Opentox-ruby installation." echo "You may need to give root password for some privileged actions right now:" -- cgit v1.2.3 From 1cb34e7d9fba5517b9a9ce9636fc926d73af7cb9 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 09:15:40 +0200 Subject: Fixed install include --- install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install') diff --git a/install b/install index 903dd67..81c7853 100755 --- a/install +++ b/install @@ -3,9 +3,9 @@ # Author: Christoph Helma, Andreas Maunz LOG="/tmp/`basename $0`-log.txt" -touch "$OT_UI_CONF" - . "./utils.sh" +touch "$OT_UI_CONF" +echo echo "Opentox-ruby installation." echo "You may need to give root password for some privileged actions right now:" cmd="sudo echo -n \"\"" && run_cmd "$cmd" "Acquire privileges" -- cgit v1.2.3 From ade43a6a3c16388b7571bff236e686e1e6f91f35 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 09:16:59 +0200 Subject: Fixed install include --- install | 1 - 1 file changed, 1 deletion(-) (limited to 'install') diff --git a/install b/install index 81c7853..fb94096 100755 --- a/install +++ b/install @@ -4,7 +4,6 @@ LOG="/tmp/`basename $0`-log.txt" . "./utils.sh" -touch "$OT_UI_CONF" echo echo "Opentox-ruby installation." echo "You may need to give root password for some privileged actions right now:" -- cgit v1.2.3 From ae03b88f5c116c079f647bf1a5ba55e0ed387685 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 10:06:44 +0200 Subject: Fixed JAVA_HOME --- install | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'install') diff --git a/install b/install index fb94096..37b86d1 100755 --- a/install +++ b/install @@ -6,7 +6,7 @@ LOG="/tmp/`basename $0`-log.txt" . "./utils.sh" echo echo "Opentox-ruby installation." -echo "You may need to give root password for some privileged actions right now:" +echo "You may need to give root password for some privileged actions right now and later:" cmd="sudo echo -n \"\"" && run_cmd "$cmd" "Acquire privileges" . "./base-install.sh" @@ -23,7 +23,7 @@ then fi echo -echo "Installation finished and configured." +echo "Installation to '$OT_DEST' finished and configured." echo echo "IMPORTANT:" echo "Include the file '$OT_UI_CONF' in your shell or system startup to have it automatically configured." -- cgit v1.2.3 From 2140505b9ee2b2b30886dd1b9c5bbf344a708b49 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 10:12:47 +0200 Subject: Fixed include file names --- install | 1 + 1 file changed, 1 insertion(+) (limited to 'install') diff --git a/install b/install index 37b86d1..5180254 100755 --- a/install +++ b/install @@ -7,6 +7,7 @@ LOG="/tmp/`basename $0`-log.txt" echo echo "Opentox-ruby installation." echo "You may need to give root password for some privileged actions right now and later:" +echo cmd="sudo echo -n \"\"" && run_cmd "$cmd" "Acquire privileges" . "./base-install.sh" -- cgit v1.2.3 From 9685dad196274640d56d9407f4576620c65f6d64 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Thu, 7 Apr 2011 10:18:58 +0200 Subject: Added better hint text --- install | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'install') diff --git a/install b/install index 5180254..d332838 100755 --- a/install +++ b/install @@ -24,8 +24,9 @@ then fi echo -echo "Installation to '$OT_DEST' finished and configured." -echo -echo "IMPORTANT:" -echo "Include the file '$OT_UI_CONF' in your shell or system startup to have it automatically configured." +echo "Installation finished and system configured." +echo "Destination: '$OT_PREFIX'" +echo "Nginx: '$NGINX_DEST'" +echo "Redis: '$REDIS_DEST'" +echo "IMPORTANT: Include the file '$OT_UI_CONF' in your shell or system startup to have the system automatically configured." echo -- cgit v1.2.3 From 65bb8707e41e48c58377657ee10c2f3360152e46 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Mon, 11 Apr 2011 09:52:22 +0200 Subject: Cleaning temp files --- install | 3 +++ 1 file changed, 3 insertions(+) (limited to 'install') diff --git a/install b/install index d332838..ce76e87 100755 --- a/install +++ b/install @@ -23,6 +23,9 @@ then . "./opentox-webservices.sh" fi +echo "Cleaning up temp files." +sudo rm -rf /tmp/openbabel* /tmp/kernlab* /tmp/ruby* /tmp/passenger* + echo echo "Installation finished and system configured." echo "Destination: '$OT_PREFIX'" -- cgit v1.2.3 From 7b6f2234bd52d129e1f29bd60a2e1e2b2bd8be88 Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Wed, 18 May 2011 09:21:44 +0200 Subject: Fixed checkout development as git@..., root check at beginning of install --- install | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'install') diff --git a/install b/install index ce76e87..daa7d57 100755 --- a/install +++ b/install @@ -2,6 +2,11 @@ # Main Opentox-ruby install script # Author: Christoph Helma, Andreas Maunz +if [ "$(id -u)" = "0" ]; then + echo "This script must not be run as root" 1>&2 + exit 1 +fi + LOG="/tmp/`basename $0`-log.txt" . "./utils.sh" echo @@ -18,9 +23,9 @@ cmd="sudo echo -n \"\"" && run_cmd "$cmd" "Acquire privileges" if [ "$install" != "gem" ] then - . "./nginx.sh" - . "./redis.sh" - . "./opentox-webservices.sh" + . "./nginx.sh" + . "./redis.sh" + . "./opentox-webservices.sh" fi echo "Cleaning up temp files." -- cgit v1.2.3 From 197f021a1beb04f1fd07ef8ae7d90440f693a01d Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Wed, 18 May 2011 09:22:33 +0200 Subject: Cleaning temp files at the beginning --- install | 3 +++ 1 file changed, 3 insertions(+) (limited to 'install') diff --git a/install b/install index daa7d57..101f1ba 100755 --- a/install +++ b/install @@ -15,6 +15,9 @@ echo "You may need to give root password for some privileged actions right now a echo cmd="sudo echo -n \"\"" && run_cmd "$cmd" "Acquire privileges" +echo "Cleaning up temp files." +sudo rm -rf /tmp/openbabel* /tmp/kernlab* /tmp/ruby* /tmp/passenger* + . "./base-install.sh" . "./ruby.sh" . "./openbabel.sh" -- cgit v1.2.3 From 12e9b288603f389dbc50e8fadb4e6c35ec1223dc Mon Sep 17 00:00:00 2001 From: Andreas Maunz Date: Wed, 18 May 2011 09:25:24 +0200 Subject: Moved temp file cleaning to start --- install | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'install') diff --git a/install b/install index 101f1ba..6a1e84f 100755 --- a/install +++ b/install @@ -15,7 +15,7 @@ echo "You may need to give root password for some privileged actions right now a echo cmd="sudo echo -n \"\"" && run_cmd "$cmd" "Acquire privileges" -echo "Cleaning up temp files." +echo "Cleaning up /tmp files." sudo rm -rf /tmp/openbabel* /tmp/kernlab* /tmp/ruby* /tmp/passenger* . "./base-install.sh" @@ -31,9 +31,6 @@ then . "./opentox-webservices.sh" fi -echo "Cleaning up temp files." -sudo rm -rf /tmp/openbabel* /tmp/kernlab* /tmp/ruby* /tmp/passenger* - echo echo "Installation finished and system configured." echo "Destination: '$OT_PREFIX'" -- cgit v1.2.3