1 files changed, 4 insertions, 6 deletions

diff --git a/deploy.sh b/deploy.sh
index b95475b1..653eec85 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -2,18 +2,16 @@
 COMPASS_DIR=`cd ${BASH_SOURCE[0]%/*}/;pwd`
 export COMPASS_DIR
 
-if [[ -z "$DEPLOY_STEP" ]]; then
-    export DEPLOY_STEP="all"
+if [[ -z $DEPLOY_COMPASS && -z $DEPLOY_HOST && -z $REDEPLOY_HOST ]]; then
+    export DEPLOY_COMPASS="true"
+    export DEPLOY_HOST="true"
 fi
 
-for i in python-cheetah python-yaml screen; do
+for i in python-cheetah python-yaml; do
     if [[ `dpkg-query -l $i` == 0 ]]; then
         continue
     fi
     sudo apt-get install -y --force-yes  $i
 done
 
-screen -ls |grep deploy|awk -F. '{print $1}'|xargs kill -9
-screen -wipe
-#screen -dmSL deploy bash $COMPASS_DIR/ci/launch.sh $*
 $COMPASS_DIR/deploy/launch.sh $*