summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2011-03-08 13:50:07 +0100
committerChristoph Helma <helma@in-silico.ch>2011-03-08 13:50:07 +0100
commitdbe3056c8af7be9b623b020055e4892ca44954b2 (patch)
tree8ad17db4525670cf23cb7a0a5eec1d910062fe6f
parent152526cb79878eee9c7e48189141c5085503f6a5 (diff)
typo in instalation type fixed
-rw-r--r--config2
-rwxr-xr-xinstall1
-rw-r--r--opentox-ruby.sh4
3 files changed, 4 insertions, 3 deletions
diff --git a/config b/config
index 6b18a2a..272b132 100644
--- a/config
+++ b/config
@@ -14,7 +14,7 @@ mysql_root=opentox
# gem installs only the opentox-ruby gem (useful, if you want to use external services with the opentox-ruby DSL)
# local local installation (authentication and authorisation disabled)
# server inter or intranet server (authentication and authorisation enabled)
-type=server
+install=server
# Git branch of services
# Options: master test development
diff --git a/install b/install
index 9a89730..9e72d13 100755
--- a/install
+++ b/install
@@ -6,6 +6,7 @@
. ./openbabel.sh
. ./kernlab.sh
. ./opentox-ruby.sh
+
if [ $install != "gem" ]
then
. ./nginx.sh
diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 595ee36..98b04f1 100644
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -18,7 +18,7 @@ else
logger=""
fi
-if [ $type = "server" ]
+if [ $install = "server" ]
then
aa="https:\/\/opensso.in-silico.ch"
else
@@ -29,7 +29,7 @@ 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-$type.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
# checkout development version and link lib to opentox-ruby gem
if [ $branch = "development" ]