summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Helma <helma@in-silico.ch>2011-02-09 12:02:18 +0100
committerChristoph Helma <helma@in-silico.ch>2011-02-09 12:02:18 +0100
commita3249570b20821307aec0a90df8bcfe5255f6164 (patch)
treea6899dc7f1e3ed023e1df6483b73919b6c005d90
parent895237357d518f53e99393ce06d96d200840f0d7 (diff)
fixed return dirs
-rw-r--r--kernlab.sh1
-rw-r--r--opentox-ruby.sh5
-rw-r--r--opentox-webservices.sh3
-rw-r--r--ruby.sh1
4 files changed, 8 insertions, 2 deletions
diff --git a/kernlab.sh b/kernlab.sh
index d96e510..db0c93d 100644
--- a/kernlab.sh
+++ b/kernlab.sh
@@ -5,3 +5,4 @@ echo "Installing kernlab"
cd /tmp
wget http://cran.r-project.org/src/contrib/Archive/kernlab/kernlab_0.9-11.tar.gz
R CMD INSTALL kernlab_0.9-11.tar.gz
+cd -
diff --git a/opentox-ruby.sh b/opentox-ruby.sh
index 47a20a7..95703ef 100644
--- a/opentox-ruby.sh
+++ b/opentox-ruby.sh
@@ -5,6 +5,8 @@ echo "Installing opentox-ruby gem"
. ./config
gem install opentox-ruby
+dir=`pwd`
+
# create config file
password=`pwgen 8 1`
servername=`hostname`.`dnsdomainname`
@@ -26,7 +28,7 @@ mkdir -p $HOME/.opentox/config
mkdir -p $HOME/.opentox/log
sed -e "s/PASSWORD/$password/;s/SERVERNAME/$servername/;s/LOGGER/$logger/;s/AA/$aa/" production.yaml > $HOME/.opentox/config/production.yaml
- checkout development version and link lib to opentox-ruby gem
+# checkout development version and link lib to opentox-ruby gem
if [ $branch = "development" ]
then
cd /var/www/opentox
@@ -38,3 +40,4 @@ then
mv $gem_lib $gem_lib~
ln -s /var/www/opentox/opentox-ruby/lib $gem_lib
fi
+cd $dir
diff --git a/opentox-webservices.sh b/opentox-webservices.sh
index d22e5f4..d41fd35 100644
--- a/opentox-webservices.sh
+++ b/opentox-webservices.sh
@@ -9,6 +9,7 @@ then
adduser --system opentox
fi
+dir=`pwd`
mkdir -p /var/www/opentox
cd /var/www/opentox
for s in compound dataset algorithm model toxcreate task; do
@@ -26,4 +27,4 @@ cd -
cd /var/www/opentox/algorithm
rake fminer:install
chown -R opentox /var/www/opentox
-cd -
+cd $dir
diff --git a/ruby.sh b/ruby.sh
index 2518939..110d0cb 100644
--- a/ruby.sh
+++ b/ruby.sh
@@ -11,3 +11,4 @@ gem sources -a http://gemcutter.org
gem sources -r http://rubygems.org/
echo "gem: --no-ri --no-rdoc" | tee -a ~/.gemrc
gem install passenger
+cd -