From 6794595b5a89552539c4e6cd858a66fe888fd755 Mon Sep 17 00:00:00 2001 From: konrad Date: Thu, 17 Aug 2017 18:21:56 +0000 Subject: [PATCH] Move Deploy Dir instead of deleting it --- src/Simple-Git-Deploy/deploy.sh | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/src/Simple-Git-Deploy/deploy.sh b/src/Simple-Git-Deploy/deploy.sh index 8967a9b..f5454db 100755 --- a/src/Simple-Git-Deploy/deploy.sh +++ b/src/Simple-Git-Deploy/deploy.sh @@ -10,13 +10,14 @@ while getopts ':k:g:d:c:' OPTION ; do esac done -#echo "-----------------------------" -#echo "Started at:" -#date -#echo "Key: ${KEY}" -#echo "Git-Url: ${GIT_URL}" -#echo "Deploy-Dir: ${DEPLOY_DIR}" -#echo "----------------------------" +echo "-----------------------------" +echo "Started at:" +date +echo "Key: ${KEY}" +echo "Git-Url: ${GIT_URL}" +echo "Deploy-Dir: ${DEPLOY_DIR}" +echo "----------------------------" +echo "" #Check for Key if [ -z "$KEY" ] @@ -35,15 +36,16 @@ fi #Check for deploy-path if [ -z "$DEPLOY_DIR" ] then - echo "You must provide a deploydir path (via -c /path/to/deploy/dir)!" + echo "You must provide a deploydir path (via -d /path/to/deploy/dir)!" exit 1 fi rm -Rf /tmp/git-deploy ssh-agent bash -c "ssh-add ${KEY}; git clone ${GIT_URL} /tmp/git-deploy" rm -Rf /tmp/git-deploy/.git -rm -Rf ${DEPLOY_DIR}/.* 2> /dev/null -rm -Rf ${DEPLOY_DIR}/* +mv ${DEPLOY_DIR} ${DEPLOY_DIR}.old +#rm -Rf ${DEPLOY_DIR}/.* 2> /dev/null +#rm -Rf ${DEPLOY_DIR}/* mv -fT /tmp/git-deploy ${DEPLOY_DIR} #cp -urfv /tmp/git-deploy/* ${DEPLOY_DIR}/* @@ -51,9 +53,10 @@ rm -rf /tmp/git-deploy if [ ! -z "$DCONTAINER_NAME" ] then - docker restart $DCONTAINER_NAME + sudo docker restart $DCONTAINER_NAME fi -#echo "Finished at:" -#date -#echo "-----------------------------" \ No newline at end of file +echo "" +echo "Finished at:" +date +echo "-----------------------------" \ No newline at end of file