diff options
| author | am <a@b.c> | 2011-06-03 10:28:33 +0200 |
|---|---|---|
| committer | am <a@b.c> | 2011-06-03 10:28:33 +0200 |
| commit | 619215cbea5695c190aa0ce6a3da50d0c8bf1058 (patch) | |
| tree | 30564170c37f4d91d774512a497a44b404ba360f | |
| parent | 658c0f0b5895562a00195405513caf2647ce7812 (diff) | |
| parent | 3351cf220073a45b6c8d295a4985ce8e30415160 (diff) | |
Merge branch 'development' of git://github.com/opentox/install into development
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | base-install.sh | 2 |
2 files changed, 3 insertions, 2 deletions
@@ -52,7 +52,6 @@ otupdate() { # Start the server otstart() { otkill - sleep 8 sudo bash -c "source $HOME/.opentox-ui.sh; nohup redis-server $HOME/opentox-ruby/redis-2.2.2/redis.conf >/dev/null 2>&1 &" sudo bash -c "source $HOME/.opentox-ui.sh; nohup nginx -c $HOME/opentox-ruby/nginx/conf/nginx.conf >/dev/null 2>&1 &" sleep 2 @@ -75,4 +74,6 @@ otreload() { otkill() { sudo killall nginx >/dev/null 2>&1 sudo bash -c "source $HOME/.opentox-ui.sh; redis-cli shutdown >/dev/null 2>&1" + while ps ax | grep PassengerHelperAgent | grep -v grep >/dev/null 2>&1; do sleep 1; done + for p in `pgrep R 2>/dev/null`; do sudo kill -9 $p; done } diff --git a/base-install.sh b/base-install.sh index 0a13c68..373df1f 100755..100644 --- a/base-install.sh +++ b/base-install.sh @@ -27,7 +27,7 @@ fi touch $OT_UI_CONF # Pkgs -packs="binutils build-essential git-core gnuplot hostname libcurl4-openssl-dev libgsl0-dev libreadline5-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libxslt1-dev lsb-release pwgen raptor-utils r-base r-base-core r-base-dev sqlite3 sun-java6-jdk wget xsltproc zlib1g-dev" +packs="binutils build-essential git-core gnuplot hostname libcurl4-openssl-dev libgsl0-dev libreadline5-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libxslt1-dev lsb-release psmisc pwgen raptor-utils r-base r-base-core r-base-dev sqlite3 sun-java6-jdk wget xsltproc zlib1g-dev" echo echo "Base Packages:" |