Fix deploy issues

Author: dmitrykuzmenkov

bin/deploy

@@ -39,6 +39,7 @@ for server in $servers; do
 
   echo 'Deploying on server '$server':'$environment
   scp $HOME/.kissrc $server:~
+  scp -r $HOME/.bin $server:~
   ssh -T $server <<"EOF"
     /bin/cat ~/.bashrc | /bin/grep -v '#.kissrc$' > ~/.bashrc.tmp
     echo "source ~/.kissrc #.kissrc" >> ~/.bashrc.tmp
@@ -54,20 +55,22 @@ EOF
 
   # Compile PROJECT on server
   ssh -T $server <<EOF
+    source ~/.kissrc
     test -L ~/$PROJECT/app && rm -f \$_
     ln -s ~/$PROJECT/rev/$revision ~/$PROJECT/app
 
     mkdir -p ~/$PROJECT/env/{etc,log,var,run,tmp,backup}
 
     test ! -L ~/$PROJECT/env/bin && ln -s ~/$PROJECT/app/bin \$_
 
-    kiss $PROJECT
+    source ~/.bin/kiss $PROJECT
     echo $environment > \$CONFIG_DIR/environment
     export PROJECT_ENV=$environment
     init
     [[ \$(/bin/ls \$TMP_DIR) ]] && /bin/rm \$TMP_DIR/*
     php-exec 'opcache_reset()' > /dev/null
 EOF
+
   # All is done
   echo 'Deployed on server '$server
   ) > $TMP_DIR/deploy.$server 2>&1 &

bin/kiss

@@ -15,20 +15,17 @@ else
 
   # Declare common used variables
   HTTP_HOST=$(hostname)
+  PROJECT=$name
+  PROJECT_DIR=$HOME/$PROJECT
   PROJECT_ENV=$(test -f $PROJECT_DIR/env/etc/environment && cat $_ || echo 'dev')
 
-  if [[ "$bash_interactive" ]]; then
-    if [[ "$PROJECT" == "$name" ]]; then
-      echo "Error: already in $PROJECT..."
-      exit 1
-    fi
-
+  if [[ -n "$bash_interactive" ]]; then
     oldpath=$(pwd)
-    cd $HOME/$name
+    cd $PROJECT_DIR
     ci_pid=$!
 
-    PROJECT=$name \
-    PROJECT_DIR=$HOME/$PROJECT \
+    PROJECT=$PROJECT \
+    PROJECT_DIR=$PROJECT_DIR \
     APP_DIR=$PROJECT_DIR/app \
     STATIC_DIR=$PROJECT_DIR/app/static \
     CONFIG_DIR=$PROJECT_DIR/env/etc \
@@ -48,10 +45,9 @@ else
     [[ -n "$ci_pid" ]] && kill $ci_pid
     cd $oldpath
   else
-
-    export PROJECT=$name
-    export PROJECT_DIR=$HOME/$PROJECT
-    export APP_DIR=$PROJECT_DIR/app \
+    export PROJECT=$PROJECT \
+      PROJECT_DIR=$PROJECT_DIR \
+      APP_DIR=$PROJECT_DIR/app \
       STATIC_DIR=$PROJECT_DIR/app/static \
       CONFIG_DIR=$PROJECT_DIR/env/etc \
       ENV_DIR=$PROJECT_DIR/env \